8263138: Initialization of sun.font.SunFontManager.platformFontMap is…

… not thread safe

Reviewed-by: aivanov, kizune, serb

src/java.desktop/share/classes/sun/font/SunFontManager.java

@@ -1433,9 +1433,10 @@ public static class FamilyDescription {
         public String boldFileName;
         public String italicFileName;
         public String boldItalicFileName;
+        boolean failed;
     }
 
-    static HashMap<String, FamilyDescription> platformFontMap;
+    static volatile HashMap<String, FamilyDescription> platformFontMap;
 
     /**
      * default implementation does nothing.
@@ -1445,8 +1446,10 @@ public HashMap<String, FamilyDescription> populateHardcodedFileNameMap() {
     }
 
     Font2D findFontFromPlatformMap(String lcName, int style) {
+        HashMap<String, FamilyDescription> platformFontMap = SunFontManager.platformFontMap;
         if (platformFontMap == null) {
             platformFontMap = populateHardcodedFileNameMap();
+            SunFontManager.platformFontMap = platformFontMap;
         }
 
         if (platformFontMap == null || platformFontMap.size() == 0) {
@@ -1460,7 +1463,7 @@ Font2D findFontFromPlatformMap(String lcName, int style) {
         }
 
         FamilyDescription fd = platformFontMap.get(firstWord);
-        if (fd == null) {
+        if (fd == null || fd.failed) {
             return null;
         }
         /* Once we've established that its at least the first word,
@@ -1527,7 +1530,7 @@ Font2D findFontFromPlatformMap(String lcName, int style) {
             if (FontUtilities.isLogging()) {
                 FontUtilities.logInfo("Hardcoded file missing looking for " + lcName);
             }
-            platformFontMap.remove(firstWord);
+            fd.failed = true;
             return null;
         }
 
@@ -1554,7 +1557,7 @@ public Boolean run() {
             if (FontUtilities.isLogging()) {
                 FontUtilities.logInfo("Hardcoded file missing looking for " + lcName);
             }
-            platformFontMap.remove(firstWord);
+            fd.failed = true;
             return null;
         }