# HG changeset patch
# User bae
# Date 1338452122 -14400
# Node ID 859419a97d2ba89bfc623d0d00a9af36a7a6deac
# Parent  d9307058c48bd638d1504517cca121bfe2d95b7d
7120895: FontConfiguration should not use thread contextClassLoader
Reviewed-by: igor, prr

diff -r d9307058c48b -r 859419a97d2b jdk/src/share/classes/sun/awt/FontConfiguration.java
--- a/jdk/src/share/classes/sun/awt/FontConfiguration.java	Wed May 30 16:17:48 2012 +0100
+++ b/jdk/src/share/classes/sun/awt/FontConfiguration.java	Thu May 31 12:15:22 2012 +0400
@@ -947,7 +947,7 @@
                     public Object run() {
                         try {
                             return Class.forName(charsetName, true,
-                                                 Thread.currentThread().getContextClassLoader());
+                                                 ClassLoader.getSystemClassLoader());
                         } catch (ClassNotFoundException e) {
                         }
                         return null;