Index: modules/awt/src/main/java/common/java/awt/EventDispatchThread.java =================================================================== --- modules/awt/src/main/java/common/java/awt/EventDispatchThread.java (revision 488594) +++ modules/awt/src/main/java/common/java/awt/EventDispatchThread.java (working copy) @@ -46,16 +46,15 @@ try { runModalLoop(null); - } catch (Exception e) { - e.printStackTrace(); + } finally { + toolkit.shutdownWatchdog.forceShutdown(); } - - toolkit.shutdownWatchdog.forceShutdown(); } void runModalLoop(ModalContext context) { long lastPaintTime = System.currentTimeMillis(); while (!shutdownPending && (context == null || context.isModalLoopRunning())) { + try { EventQueue eventQueue = toolkit.getSystemEventQueueImpl(); NativeEvent ne = nativeQueue.getNextEvent(); @@ -85,6 +84,9 @@ waitForAnyEvent(); } } + } catch (Throwable t) { + t.printStackTrace(); + } } }