diff options
| -rw-r--r-- | android_icu4j/src/main/java/android/icu/impl/ICUService.java | 6 | ||||
| -rw-r--r-- | icu4j/main/classes/core/src/com/ibm/icu/impl/ICUService.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/android_icu4j/src/main/java/android/icu/impl/ICUService.java b/android_icu4j/src/main/java/android/icu/impl/ICUService.java index 850da1afd..aa79df43e 100644 --- a/android_icu4j/src/main/java/android/icu/impl/ICUService.java +++ b/android_icu4j/src/main/java/android/icu/impl/ICUService.java @@ -597,13 +597,15 @@ public class ICUService extends ICUNotifier { Factory f = lIter.previous(); f.updateVisibleIDs(mutableMap); } - this.idcache = Collections.unmodifiableMap(mutableMap); + Map<String, Factory> result = Collections.unmodifiableMap(mutableMap); + this.idcache = result; + return result; } finally { factoryLock.releaseRead(); } } + return idcache; } - return idcache; } private Map<String, Factory> idcache; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUService.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUService.java index 4db16b382..afdbfa9f7 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUService.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUService.java @@ -592,13 +592,15 @@ public class ICUService extends ICUNotifier { Factory f = lIter.previous(); f.updateVisibleIDs(mutableMap); } - this.idcache = Collections.unmodifiableMap(mutableMap); + Map<String, Factory> result = Collections.unmodifiableMap(mutableMap); + this.idcache = result; + return result; } finally { factoryLock.releaseRead(); } } + return idcache; } - return idcache; } private Map<String, Factory> idcache; |