JRE-599 Support explicitly registered fonts on macOS in sun.font.FontUtilities.getCompositeFontUIResourcejb8u152-b1136.1jb8u152-b1136

fix regression (JRE-613)

1 files changed, 4 insertions, 3 deletions

diff --git a/src/share/classes/sun/font/SunFontManager.java b/src/share/classes/sun/font/SunFontManager.java
index 232f44a708..5963b9cda1 100644
--- a/src/share/classes/sun/font/SunFontManager.java
+++ b/src/share/classes/sun/font/SunFontManager.java
@@ -634,12 +634,13 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
             newFont = oldFont;
         }
         PhysicalFont physicalFont = (PhysicalFont)newFont;
-        CompositeFont dialog2D =
-            (CompositeFont)findFont2D("dialog", style, NO_FALLBACK);
+        Font2D dialog2D = findFont2D("dialog", style, NO_FALLBACK);
         if (dialog2D == null) { /* shouldn't happen */
             return handle;
         }
-        CompositeFont compFont = new CompositeFont(physicalFont, dialog2D);
+        CompositeFont compFont = dialog2D instanceof CompositeFont
+                ? new CompositeFont(physicalFont, (CompositeFont) dialog2D)
+                : new CompositeFont(new PhysicalFont[]{physicalFont, (PhysicalFont) dialog2D});
         Font2DHandle newHandle = new Font2DHandle(compFont);
         return newHandle;
     }