From b4abbf2f17a5cdb2d335acfcdd12b7d5a67a44f7 Mon Sep 17 00:00:00 2001
From: prr <unknown>
Date: Thu, 13 Jan 2011 14:11:56 -0800
Subject: [PATCH] 6917884: NPE in
 sun.font.FcFontConfiguration.getPlatformFontNames Reviewed-by: igor, jgodinez

---
 src/solaris/classes/sun/font/FontConfigManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/solaris/classes/sun/font/FontConfigManager.java b/src/solaris/classes/sun/font/FontConfigManager.java
index bd83e706f..5832683c0 100644
--- a/src/solaris/classes/sun/font/FontConfigManager.java
+++ b/src/solaris/classes/sun/font/FontConfigManager.java
@@ -214,8 +214,9 @@ public class FontConfigManager {
             if (FontUtilities.isLogging()) {
                 PlatformLogger logger = FontUtilities.getLogger();
                 logger.info("Fontconfig returned no fonts at all.");
-                return;
             }
+            fontConfigFailed = true;
+            return;
         } else if (fontConfigFailed) {
             for (int i = 0; i< fontArr.length; i++) {
                 if (fontArr[i].firstFont == null) {
-- 
GitLab