diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-07 13:55:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-07 13:55:23 +0000 |
| commit | a0c54a4c17c81896e2da9bf1a2cda837ebbe6f57 (patch) | |
| tree | ab4b88ce7d5b53686ad5d19ac6658adfcd5b2e2e | |
| parent | 2285458518d6068ad0947e938d3394521aefe03b (diff) | |
| parent | 1447a68d44147724dcbb20669efae0b05d31f2ea (diff) | |
| download | icu-a0c54a4c17c81896e2da9bf1a2cda837ebbe6f57.tar.gz | |
Fix ICUServiceThreadTest flakiness am: 404526ce6e am: 1447a68d44
Change-Id: I64884ea42934ed477f0d68077c077e8b890b4774
| -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; |