6892485: Deadlock in SunGraphicsEnvironment / FontManager
authorrkennke
Wed, 03 Mar 2010 15:50:33 +0100
changeset 4954 1f09a5b49505
parent 4912 576ba2f49ac4
child 4955 e99245ecb5b2
6892485: Deadlock in SunGraphicsEnvironment / FontManager Summary: Synchronize on correct monitor in SunFontManager. Reviewed-by: igor, prr
jdk/src/share/classes/sun/font/SunFontManager.java
--- a/jdk/src/share/classes/sun/font/SunFontManager.java	Thu Feb 18 13:31:46 2010 -0800
+++ b/jdk/src/share/classes/sun/font/SunFontManager.java	Wed Mar 03 15:50:33 2010 +0100
@@ -3058,7 +3058,7 @@
             return;
         }
         /* Use lock specific to the font system */
-        synchronized (lucidaFontName) {
+        synchronized (this) {
             if (FontUtilities.debugFonts()) {
                 Thread.dumpStack();
                 FontUtilities.getLogger()
@@ -3194,7 +3194,7 @@
             return;
         }
         /* Use lock specific to the font system */
-        synchronized (lucidaFontName) {
+        synchronized (this) {
             if (FontUtilities.debugFonts()) {
                 Thread.dumpStack();
                 FontUtilities.getLogger().info("loadAllFontFiles() called");