Automatic merge of jdk:master into master

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

@@ -353,6 +353,9 @@ public Void run() {
 
                 String[] fontInfo = getDefaultPlatformFont();
                 defaultFontName = fontInfo[0];
+                if (defaultFontName == null && FontUtilities.debugFonts()) {
+                    FontUtilities.getLogger().warning("defaultFontName is null");
+                }
                 defaultFontFileName = fontInfo[1];
 
                 String extraFontPath = fontConfig.getExtraFontPath();
@@ -1888,6 +1891,7 @@ private Font2D findFontFromPlatform(String lcName, int style) {
      * may be able to emulate the required style.
      */
     public Font2D findFont2D(String name, int style, int fallback) {
+        if (name == null) return null;
         String lowerCaseName = name.toLowerCase(Locale.ENGLISH);
         String mapName = lowerCaseName + dotStyleStr(style);
 

src/java.desktop/unix/classes/sun/awt/FcFontManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,8 @@ public FontConfiguration createFontConfiguration(boolean preferLocaleFonts,
          */
         if (info[0] == null) {
             if (fontConfigFonts != null && fontConfigFonts.length > 0 &&
-                fontConfigFonts[0].firstFont.fontFile != null) {
+                fontConfigFonts[0].firstFont.fontFile != null &&
+                fontConfigFonts[0].firstFont.fullName != null) {
                 info[0] = fontConfigFonts[0].firstFont.fullName;
                 info[1] = fontConfigFonts[0].firstFont.fontFile;
             } else {