Commit 6fdab8cc by Fernando Nasser Committed by Fernando Nasser

EventQueue.java (invokeAndWait): Use list-aware isDispatchThread method to…

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
parent f18be892
2004-01-19 Fernando Nasser <fnasser@redhat.com> 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>
* java/awt/EventQueue.java (pop): Prevent racing condition to add * java/awt/EventQueue.java (pop): Prevent racing condition to add
events to the queue out of order by acquiring locks in the proper events to the queue out of order by acquiring locks in the proper
order and not by releasing one before acquiring the other. order and not by releasing one before acquiring the other.
......
...@@ -231,10 +231,11 @@ public class EventQueue ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment