From: Tom Tromey <tromey@redhat.com>
Date: Tue, 13 Nov 2001 23:09:23 +0000 (+0000)
Subject: re PR libgcj/4859 (java.util.Timer class throw IllegalStateException on cancel())
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9d44b00b686b9973139863c7d6472c2b7a11eb3;p=gcc.git

re PR libgcj/4859 (java.util.Timer class throw IllegalStateException on cancel())

	Fix for PR libgcj/4859:
	* java/util/Timer.java (TaskQueue.isStopped): New method.
	(Scheduler.run): Don't re-schedule task if queue has been
	stopped.

From-SVN: r46994
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9dfcd7b32e9..fd3e7bab640 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-13  Tom Tromey  <tromey@redhat.com>
+
+	Fix for PR libgcj/4859:
+	* java/util/Timer.java (TaskQueue.isStopped): New method.
+	(Scheduler.run): Don't re-schedule task if queue has been
+	stopped.
+
 2001-11-07  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/java/util/Timer.java b/libjava/java/util/Timer.java
index 32c0bea3b3f..2c7197f2dbe 100644
--- a/libjava/java/util/Timer.java
+++ b/libjava/java/util/Timer.java
@@ -285,6 +285,14 @@ public class Timer
       this.notify();
     }
 
+    /**
+     * This method returns <code>true</code> if the queue has been
+     * stopped.
+     */
+    public synchronized boolean isStopped ()
+    {
+      return this.heap == null;
+    }
   }				// TaskQueue
 
   /**
@@ -337,8 +345,9 @@ public class Timer
 		}
 	    }
 
-	  // Calculate next time and possibly re-enqueue
-	  if (task.scheduled >= 0)
+	  // Calculate next time and possibly re-enqueue.
+	  // Don't bother re-scheduling if the queue has been stopped.
+	  if (! queue.isStopped () && task.scheduled >= 0)
 	    {
 	      if (task.fixed)
 		{