* javax/swing/Timer.java (Waker.run): Only break out when !running.

1 files changed, 12 insertions, 3 deletions

diff --git a/javax/swing/Timer.java b/javax/swing/Timer.java
index e38915dc3..b55465db5 100644
--- a/javax/swing/Timer.java
+++ b/javax/swing/Timer.java
@@ -68,7 +68,15 @@ public class Timer
       running = true;
       try
         {
-          sleep(initialDelay);
+          try
+            {
+              sleep(initialDelay);
+            }
+          catch (InterruptedException e)
+            {
+              if (!running)
+                return;
+            }
 
           queueEvent();
 
@@ -81,7 +89,8 @@ public class Timer
                   }
                 catch (InterruptedException e)
                   {
-                    return;
+                    if (!running)
+                      break;
                   }
                 queueEvent();
 
@@ -93,7 +102,7 @@ public class Timer
               }
           running = false;
         }
-      catch (Exception e)
+      finally
         {
           // The timer is no longer running.
           running = false;