From 44383570a17e7b4d82c4663fb95d7fa76d318ace Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 17 Oct 2013 21:22:05 +0400
Subject: [PATCH] 8026356: [macosx] Found one Java-level
 deadlock:"AWT-EventQueue-0" && main

Reviewed-by: anthony, art
---
 jdk/src/share/classes/java/awt/Component.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/jdk/src/share/classes/java/awt/Component.java b/jdk/src/share/classes/java/awt/Component.java
index f7e2fbdba05..b3471c95edb 100644
--- a/jdk/src/share/classes/java/awt/Component.java
+++ b/jdk/src/share/classes/java/awt/Component.java
@@ -276,7 +276,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
      * @see #getFont
      * @see #setFont
      */
-    Font        font;
+    volatile Font font;
 
     /**
      * The font which the peer is currently using.
@@ -1885,10 +1885,8 @@ public abstract class Component implements ImageObserver, MenuContainer,
     public void setFont(Font f) {
         Font oldFont, newFont;
         synchronized(getTreeLock()) {
-            synchronized (this) {
-                oldFont = font;
-                newFont = font = f;
-            }
+            oldFont = font;
+            newFont = font = f;
             ComponentPeer peer = this.peer;
             if (peer != null) {
                 f = getFont();