8274317: Unnecessary reentrant synchronized block in java.awt.Cursor

Reviewed-by: serb, pbansal, prr
openjdk · Sep 27, 2021 · 7436a77 · 7436a77 · openjdk-notifier · Sep 27, 2021
1 parent 7426fd4
commit 7436a77
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/java.desktop/share/classes/java/awt/Cursor.java b/src/java.desktop/share/classes/java/awt/Cursor.java
@@ -295,10 +295,7 @@ public static Cursor getSystemCustomCursor(final String name)
         Cursor cursor = systemCustomCursors.get(name);
 
         if (cursor == null) {
-            synchronized(systemCustomCursors) {
-                if (systemCustomCursorProperties == null)
-                    loadSystemCustomCursorProperties();
-            }
+            loadSystemCustomCursorProperties();
 
             String prefix = CURSOR_DOT_PREFIX + name;
             String key    = prefix + DOT_FILE_SUFFIX;
@@ -433,7 +430,10 @@ public String toString() {
      */
     @SuppressWarnings("removal")
     private static void loadSystemCustomCursorProperties() throws AWTException {
-        synchronized(systemCustomCursors) {
+        synchronized (systemCustomCursors) {
+            if (systemCustomCursorProperties != null) {
+                return;
+            }
             systemCustomCursorProperties = new Properties();
 
             try {