src/java.desktop/share/classes/sun/awt/FontConfiguration.java

*** 180,196 ****
--- 180,202 ----
          String javaHome = System.getProperty("java.home");
          if (javaHome == null) {
              throw new Error("java.home property not set");
          }
          javaLib = javaHome + File.separator + "lib";
+         String javaConfFonts = javaHome +
+                                File.separator + "conf" +
+                                File.separator + "fonts";
          String userConfigFile = System.getProperty("sun.awt.fontconfig");
          if (userConfigFile != null) {
              fontConfigFile = new File(userConfigFile);
          } else {
+             fontConfigFile = findFontConfigFile(javaConfFonts);
+             if (fontConfigFile == null) {
                  fontConfigFile = findFontConfigFile(javaLib);
              }
          }
+     }
  
      private void readFontConfigFile(File f) {
          /* This is invoked here as readFontConfigFile is only invoked
           * once per VM, and always in a privileged context, thus the
           * directory containing installed fall back fonts is accessed
*** 273,284 ****
              return f;
          }
          return null;
      }
  
!     private File findFontConfigFile(String javaLib) {
!         String baseName = javaLib + File.separator + "fontconfig";
          File configFile;
          String osMajorVersion = null;
          if (osVersion != null && osName != null) {
              configFile = findImpl(baseName + "." + osName + "." + osVersion);
              if (configFile != null) {
--- 279,293 ----
              return f;
          }
          return null;
      }
  
!     private File findFontConfigFile(String dir) {
!         if (!(new File(dir)).exists()) {
!             return null;
!         }
!         String baseName = dir + File.separator + "fontconfig";
          File configFile;
          String osMajorVersion = null;
          if (osVersion != null && osName != null) {
              configFile = findImpl(baseName + "." + osName + "." + osVersion);
              if (configFile != null) {