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
This commit is contained in:
Fernando Nasser 2004-01-19 18:22:29 +00:00 committed by Fernando Nasser
parent f18be892cb
commit 6fdab8ccdb
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2004-01-19 Fernando Nasser <fnasser@redhat.com>
* java/awt/EventQueue.java (invokeAndWait): Use list-aware
isDispatchThread method to replace wrong test condition.
2004-01-19 Fernando Nasser <fnasser@redhat.com> 2004-01-19 Fernando Nasser <fnasser@redhat.com>
* java/awt/EventQueue.java (pop): Prevent racing condition to add * java/awt/EventQueue.java (pop): Prevent racing condition to add

View File

@ -231,10 +231,11 @@ public class EventQueue
public static void invokeAndWait(Runnable runnable) public static void invokeAndWait(Runnable runnable)
throws InterruptedException, InvocationTargetException throws InterruptedException, InvocationTargetException
{ {
if (isDispatchThread ())
throw new Error("Can't call invokeAndWait from event dispatch thread");
EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue(); EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
Thread current = Thread.currentThread(); Thread current = Thread.currentThread();
if (current == eq.dispatchThread)
throw new Error("Can't call invokeAndWait from event dispatch thread");
InvocationEvent ie = InvocationEvent ie =
new InvocationEvent(eq, runnable, current, true); new InvocationEvent(eq, runnable, current, true);