From 1dce4ceddd3c2e0a986e7e5fcdc46790ef8043fa Mon Sep 17 00:00:00 2001
From: Igor Kushnirskiy <idk@openjdk.org>
Date: Fri, 25 Jul 2008 14:26:27 -0400
Subject: [PATCH] 6699328: NullPointerException in EventQueue.dispatchEvent
 when applet is closed, only reprise/scenario applet

Reviewed-by: bchristi
---
 .../com/sun/java/swing/SwingUtilities3.java   | 32 +++++++++++--------
 .../classes/sun/awt/EventQueueDelegate.java   |  4 +--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java b/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
index 9268d7370a3..28d9e8af6ec 100644
--- a/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
+++ b/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
@@ -133,42 +133,46 @@ public class SwingUtilities3 {
         }
 
         @Override
-        public void afterDispatch(AWTEvent event, Object handle) {
+        public void afterDispatch(AWTEvent event, Object handle) throws InterruptedException {
             afterDispatchEventArgument[0] = event;
             afterDispatchHandleArgument[0] = handle;
             try {
                 afterDispatchCallable.call();
+            } catch (InterruptedException e) {
+                throw e;
+            } catch (RuntimeException e) {
+                throw e;
             } catch (Exception e) {
-                if (e instanceof RuntimeException) {
-                    throw (RuntimeException) e;
-                }
+                throw new RuntimeException(e);
             }
         }
 
         @Override
-        public Object beforeDispatch(AWTEvent event) {
+        public Object beforeDispatch(AWTEvent event) throws InterruptedException {
             beforeDispatchEventArgument[0] = event;
             try {
                 return beforeDispatchCallable.call();
+            } catch (InterruptedException e) {
+                throw e;
+            } catch (RuntimeException e) {
+                throw e;
             } catch (Exception e) {
-                if (e instanceof RuntimeException) {
-                    throw (RuntimeException) e;
-                }
+                throw new RuntimeException(e);
             }
-            return null;
         }
 
         @Override
-        public AWTEvent getNextEvent(EventQueue eventQueue) {
+        public AWTEvent getNextEvent(EventQueue eventQueue) throws InterruptedException {
             getNextEventEventQueueArgument[0] = eventQueue;
             try {
                 return getNextEventCallable.call();
+            } catch (InterruptedException e) {
+                throw e;
+            } catch (RuntimeException e) {
+                throw e;
             } catch (Exception e) {
-                if (e instanceof RuntimeException) {
-                    throw (RuntimeException) e;
-                }
+                throw new RuntimeException(e);
             }
-            return null;
         }
     }
 }
diff --git a/jdk/src/share/classes/sun/awt/EventQueueDelegate.java b/jdk/src/share/classes/sun/awt/EventQueueDelegate.java
index 8f8a6f3fe0b..c9d0a90d2af 100644
--- a/jdk/src/share/classes/sun/awt/EventQueueDelegate.java
+++ b/jdk/src/share/classes/sun/awt/EventQueueDelegate.java
@@ -58,7 +58,7 @@ public class EventQueueDelegate {
          * @param event  to be dispatched by {@code dispatch} method
          * @return handle to be passed to {@code afterDispatch} method
          */
-        public Object beforeDispatch(AWTEvent event);
+        public Object beforeDispatch(AWTEvent event) throws InterruptedException;
 
         /**
          * Notifies delegate after EventQueue.dispatch method.
@@ -66,6 +66,6 @@ public class EventQueueDelegate {
          * @param event {@code event} dispatched by the {@code dispatch} method
          * @param handle object which came from {@code beforeDispatch} method
          */
-        public void afterDispatch(AWTEvent event, Object handle);
+        public void afterDispatch(AWTEvent event, Object handle) throws InterruptedException;
     }
 }