From c1bf12c7a1ec5001fb07761f0a5b6fe8a2aa3dee Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 13 Jan 2011 14:11:56 -0800
Subject: [PATCH] 6917884: NPE in
 sun.font.FcFontConfiguration.getPlatformFontNames

Reviewed-by: igor, jgodinez
---
 jdk/src/solaris/classes/sun/font/FontConfigManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/src/solaris/classes/sun/font/FontConfigManager.java b/jdk/src/solaris/classes/sun/font/FontConfigManager.java
index bd83e706ff3..5832683c04e 100644
--- a/jdk/src/solaris/classes/sun/font/FontConfigManager.java
+++ b/jdk/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) {