changeset 350:697caff58d3f

6892485: Deadlock in SunGraphicsEnvironment / FontManager Summary: Synchronize on correct monitor in SunFontManager. Reviewed-by: igor, prr, martin
author rkennke
date Tue, 04 May 2010 18:32:27 -0700
parents a78afce59809
children 80266a3303b2 4eb21f9fa9ec
files src/share/classes/sun/java2d/SunGraphicsEnvironment.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/java2d/SunGraphicsEnvironment.java	Mon May 03 18:17:08 2010 +0200
+++ b/src/share/classes/sun/java2d/SunGraphicsEnvironment.java	Tue May 04 18:32:27 2010 -0700
@@ -459,7 +459,7 @@
             return;
         }
         /* Use lock specific to the font system */
-        synchronized (lucidaFontName) {
+        synchronized (FontManager.class) {
             if (debugFonts) {
                 Thread.dumpStack();
                 logger.info("SunGraphicsEnvironment.loadFonts() called");
@@ -499,7 +499,7 @@
             return;
         }
         /* Use lock specific to the font system */
-        synchronized (lucidaFontName) {
+        synchronized (FontManager.class) {
             if (debugFonts) {
                 Thread.dumpStack();
                 logger.info("loadAllFontFiles() called");