changeset 2293:840601ac5ab7

6892485: Deadlock in SunGraphicsEnvironment / FontManager Summary: Synchronize on correct monitor in SunFontManager. Reviewed-by: igor, prr
author rkennke
date Wed, 03 Mar 2010 15:50:33 +0100
parents a9b4fde406d4
children 1d7db2d5c4c5
files src/share/classes/sun/font/SunFontManager.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/font/SunFontManager.java	Thu Feb 18 13:31:46 2010 -0800
+++ b/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");