diff --git a/jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/AbstractMap.java b/jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/AbstractMap.java index 3f4ab5448a..301da30e6e 100644 --- a/jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/AbstractMap.java +++ b/jre_emul/android/platform/libcore/ojluni/src/main/java/java/util/AbstractMap.java @@ -331,8 +331,14 @@ public void clear() { * } *} */ - transient Set keySet; - transient Collection values; + + /** + * J2ObjC: Despite the discussion above, no field race is safe in J2ObjC because + * field access is not atomic in J2ObjC, so mark these volatile so the abstract + * implementation is always safe. + */ + transient volatile Set keySet; + transient volatile Collection values; /** * {@inheritDoc}