src/share/classes/java/awt/EventDispatchThread.java

@@ -33,11 +33,11 @@
 import java.security.AccessController;
 import sun.security.action.GetPropertyAction;
 import sun.awt.AWTAutoShutdown;
 import sun.awt.SunToolkit;
 
-import java.util.Vector;
+import java.util.ArrayList;
 import sun.util.logging.PlatformLogger;
 
 import sun.awt.dnd.SunDragSourceContextPeer;
 import sun.awt.EventQueueDelegate;
 

@@ -64,15 +64,14 @@
 
     private static final PlatformLogger eventLog = PlatformLogger.getLogger("java.awt.event.EventDispatchThread");
 
     private EventQueue theQueue;
     private boolean doDispatch = true;
-    private boolean threadDeathCaught = false;
 
     private static final int ANY_EVENT = -1;
 
-    private Vector<EventFilter> eventFilters = new Vector<EventFilter>();
+    private ArrayList<EventFilter> eventFilters = new ArrayList<EventFilter>();
 
     EventDispatchThread(ThreadGroup group, String name, EventQueue queue) {
         super(group, name);
         setEventQueue(queue);
     }

@@ -92,11 +91,11 @@
                         return true;
                     }
                 });
             } finally {
                 EventQueue eq = getEventQueue();
-                if (eq.detachDispatchThread(this) || threadDeathCaught) {
+                if (eq.detachDispatchThread(this) || isInterrupted()) {
                     break;
                 }
             }
         }
     }

@@ -214,13 +213,11 @@
             }
 
             return true;
         }
         catch (ThreadDeath death) {
-            threadDeathCaught = true;
-            return false;
-
+            throw death;
         }
         catch (InterruptedException interruptedException) {
             return false; // AppContext.dispose() interrupts all
                           // Threads in the AppContext