From 6fdab8ccdb27688b53e0b219482c9ee3de361e54 Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Mon, 19 Jan 2004 18:22:29 +0000 Subject: [PATCH] EventQueue.java (invokeAndWait): Use list-aware isDispatchThread method to replace wrong test condition. * java/awt/EventQueue.java (invokeAndWait): Use list-aware isDispatchThread method to replace wrong test condition. From-SVN: r76165 --- libjava/ChangeLog | 5 +++++ libjava/java/awt/EventQueue.java | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2b34a94f9e1b..3c779ddbdcb0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-01-19 Fernando Nasser + + * java/awt/EventQueue.java (invokeAndWait): Use list-aware + isDispatchThread method to replace wrong test condition. + 2004-01-19 Fernando Nasser * java/awt/EventQueue.java (pop): Prevent racing condition to add diff --git a/libjava/java/awt/EventQueue.java b/libjava/java/awt/EventQueue.java index 7df40edee386..5cdfa634265c 100644 --- a/libjava/java/awt/EventQueue.java +++ b/libjava/java/awt/EventQueue.java @@ -231,10 +231,11 @@ public class EventQueue public static void invokeAndWait(Runnable runnable) throws InterruptedException, InvocationTargetException { + if (isDispatchThread ()) + throw new Error("Can't call invokeAndWait from event dispatch thread"); + EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue(); Thread current = Thread.currentThread(); - if (current == eq.dispatchThread) - throw new Error("Can't call invokeAndWait from event dispatch thread"); InvocationEvent ie = new InvocationEvent(eq, runnable, current, true);