[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for Timer

[Kaffe CVS]

PatchSet 5570 
Date: 2004/12/08 19:15:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for Timer

2004-12-08  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/util/Timer.java:
        Resynced with GNU Classpath.

        2004-12-07  Jeroen Frijters  <jeroen at frijters.net>

        * java/util/Timer.java
        (run): Stop the queue if a task throws an exception.

Members: 
	ChangeLog:1.3116->1.3117 
	libraries/javalib/java/util/Timer.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3116 kaffe/ChangeLog:1.3117
--- kaffe/ChangeLog:1.3116	Wed Dec  8 18:24:46 2004
+++ kaffe/ChangeLog	Wed Dec  8 19:15:29 2004
@@ -1,5 +1,15 @@
 2004-12-08  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/util/Timer.java:
+	Resynced with GNU Classpath.
+	
+	2004-12-07  Jeroen Frijters  <jeroen at frijters.net>
+
+	* java/util/Timer.java
+	(run): Stop the queue if a task throws an exception.
+	
+2004-12-08  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/beans/PropertyDescriptor.java:
 	Resynced with GNU Classpath.
 	
Index: kaffe/libraries/javalib/java/util/Timer.java
diff -u kaffe/libraries/javalib/java/util/Timer.java:1.9 kaffe/libraries/javalib/java/util/Timer.java:1.10
--- kaffe/libraries/javalib/java/util/Timer.java:1.9	Sat Dec  4 12:14:00 2004
+++ kaffe/libraries/javalib/java/util/Timer.java	Wed Dec  8 19:15:32 2004
@@ -345,11 +345,14 @@
 		}
               catch (ThreadDeath death)
                 {
+                  // If an exception escapes, the Timer becomes invalid.
+                  queue.stop();
                   throw death;
                 }
 	      catch (Throwable t)
-		{		
-		  /* ignore all errors */
+		{
+		  // If an exception escapes, the Timer becomes invalid.
+                  queue.stop();
 		}
 	    }