1 files changed, 2 insertions, 10 deletions
diff --git a/java/awt/EventQueue.java b/java/awt/EventQueue.java
index a76ba1afb..eb17449a0 100644
--- a/java/awt/EventQueue.java
+++ b/java/awt/EventQueue.java
@@ -48,7 +48,6 @@ import java.awt.event.InvocationEvent;
 import java.awt.event.PaintEvent;
 import java.awt.peer.ComponentPeer;
 import java.awt.peer.LightweightPeer;
-import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.util.EmptyStackException;
 
@@ -129,15 +128,8 @@ public class EventQueue
     if (peekEvent() != null)
       return false;
 
-    synchronized (Frame.weakFrames)
-      {
-        for (WeakReference<Frame> r : Frame.weakFrames)
-          {
-            Frame f = (Frame) r.get();
-            if (f != null && f.isDisplayable())
-              return false;
-          }
-      }
+    if (Frame.hasDisplayableFrames())
+      return false;
 
     return true;
   }