8302849: SurfaceManager might expose partially constructed object

minborg · minborg · commit 63ef2143289f · 2023-02-22T11:45:51.000Z
Reviewed-by: serb
diff --git a/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java b/src/java.desktop/share/classes/sun/awt/image/SurfaceManager.java
@@ -89,7 +89,7 @@ public static void setManager(Image img, SurfaceManager mgr) {
         imgaccessor.setSurfaceManager(img, mgr);
     }
 
-    private ConcurrentHashMap<Object,Object> cacheMap;
+    private volatile ConcurrentHashMap<Object,Object> cacheMap;
 
     /**
      * Return an arbitrary cached object for an arbitrary cache key.

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static void setManager(Image img, SurfaceManager mgr) {`
`89`	`89`	`imgaccessor.setSurfaceManager(img, mgr);`
`90`	`90`	`}`
`91`	`91`
`92`		`- private ConcurrentHashMap<Object,Object> cacheMap;`
	`92`	`+ private volatile ConcurrentHashMap<Object,Object> cacheMap;`
`93`	`93`
`94`	`94`	`/**`
`95`	`95`	`* Return an arbitrary cached object for an arbitrary cache key.`