src/share/classes/sun/font/FontManagerFactory.java

*** 66,92 ****
  
          if (instance != null) {
              return instance;
          }
  
-         String fmClassName = AccessController.doPrivileged(
-                 new GetPropertyAction("sun.font.fontmanager",
-                                       DEFAULT_CLASS));
- 
-         try {
-             @SuppressWarnings("unchecked")
-             ClassLoader cl = (ClassLoader)
                  AccessController.doPrivileged(new PrivilegedAction() {
-                     public Object run() {
-                         return ClassLoader.getSystemClassLoader();
-                     }
-                 });
  
!             @SuppressWarnings("unchecked")
              Class fmClass = Class.forName(fmClassName, true, cl);
              instance = (FontManager) fmClass.newInstance();
- 
          } catch (ClassNotFoundException ex) {
              InternalError err = new InternalError();
              err.initCause(ex);
              throw err;
  
--- 66,85 ----
  
          if (instance != null) {
              return instance;
          }
  
          AccessController.doPrivileged(new PrivilegedAction() {
  
!             public Object run() {
!                 try {
!                     String fmClassName =
!                             System.getProperty("sun.font.fontmanager",
!                                                DEFAULT_CLASS);
!                     ClassLoader cl = ClassLoader.getSystemClassLoader();
                      Class fmClass = Class.forName(fmClassName, true, cl);
                      instance = (FontManager) fmClass.newInstance();
                  } catch (ClassNotFoundException ex) {
                      InternalError err = new InternalError();
                      err.initCause(ex);
                      throw err;
  
*** 98,106 ****
--- 91,102 ----
                  } catch (IllegalAccessException ex) {
                      InternalError err = new InternalError();
                      err.initCause(ex);
                      throw err;
                  }
+                 return null;
+             }
+         });
  
          return instance;
      }
  }