diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java index 71400c8ec32..b0c1fcf8c54 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java @@ -567,9 +567,8 @@ public abstract class Collator implements Comparator, Cloneable public static Locale[] getAvailableLocales() { // TODO make this wrap getAvailableULocales later if (shim == null) { - ClassLoader cl = Collator.class.getClassLoader(); return ICUResourceBundle.getAvailableLocales( - ICUResourceBundle.ICU_COLLATION_BASE_NAME, cl); + ICUResourceBundle.ICU_COLLATION_BASE_NAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER); } return shim.getAvailableLocales(); } @@ -584,9 +583,8 @@ public abstract class Collator implements Comparator, Cloneable */ public static final ULocale[] getAvailableULocales() { if (shim == null) { - ClassLoader cl = Collator.class.getClassLoader(); return ICUResourceBundle.getAvailableULocales( - ICUResourceBundle.ICU_COLLATION_BASE_NAME, cl); + ICUResourceBundle.ICU_COLLATION_BASE_NAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER); } return shim.getAvailableULocales(); } @@ -724,8 +722,7 @@ public abstract class Collator implements Comparator, Cloneable public static final ULocale getFunctionalEquivalent(String keyword, ULocale locID, boolean isAvailable[]) { - ClassLoader cl = Collator.class.getClassLoader(); - return ICUResourceBundle.getFunctionalEquivalent(BASE, cl, RESOURCE, + return ICUResourceBundle.getFunctionalEquivalent(BASE, ICUResourceBundle.ICU_DATA_CLASS_LOADER, RESOURCE, keyword, locID, isAvailable, true); } diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorServiceShim.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorServiceShim.java index 1eb33743781..ab1a7f4a590 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorServiceShim.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollatorServiceShim.java @@ -85,8 +85,8 @@ final class CollatorServiceShim extends Collator.ServiceShim { // TODO rewrite this to just wrap getAvailableULocales later Locale[] result; if (service.isDefault()) { - ClassLoader cl = getClass().getClassLoader(); - result = ICUResourceBundle.getAvailableLocales(ICUResourceBundle.ICU_COLLATION_BASE_NAME, cl); + result = ICUResourceBundle.getAvailableLocales(ICUResourceBundle.ICU_COLLATION_BASE_NAME, + ICUResourceBundle.ICU_DATA_CLASS_LOADER); } else { result = service.getAvailableLocales(); } @@ -96,8 +96,8 @@ final class CollatorServiceShim extends Collator.ServiceShim { ULocale[] getAvailableULocales() { ULocale[] result; if (service.isDefault()) { - ClassLoader cl = getClass().getClassLoader(); - result = ICUResourceBundle.getAvailableULocales(ICUResourceBundle.ICU_COLLATION_BASE_NAME, cl); + result = ICUResourceBundle.getAvailableULocales(ICUResourceBundle.ICU_COLLATION_BASE_NAME, + ICUResourceBundle.ICU_DATA_CLASS_LOADER); } else { result = service.getAvailableULocales(); }