changeset 3502:9f3f38c150b5

6917884: NPE in sun.font.FcFontConfiguration.getPlatformFontNames Reviewed-by: igor, jgodinez
author prr
date Thu, 13 Jan 2011 14:11:56 -0800
parents 76b8fa7fd229
children 987aeabbfda3
files src/solaris/classes/sun/font/FontConfigManager.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/solaris/classes/sun/font/FontConfigManager.java	Thu Jan 13 12:08:01 2011 -0800
+++ b/src/solaris/classes/sun/font/FontConfigManager.java	Thu Jan 13 14:11:56 2011 -0800
@@ -214,8 +214,9 @@
             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) {