commit fc8f99aa6c699438b29940fa7428f145166d1413
author Paul Ferraro <pferraro@apache.org> Thu Mar 17 05:17:29 2005 +0000
committer Paul Ferraro <pferraro@apache.org> Thu Mar 17 05:17:29 2005 +0000
tree 98f2cf9350f1d2452899a5aacdeb37fec11fbc95
parent 0516adc5c31eb31af123b914730291a4acde3692

Ensures that interupting the thread will always terminate the run() method
TAPESTRY-230: Ignored interruptedException prevents Janitorthread termination.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/tapestry/branches/branch-3-0@244162 13f79535-47bb-0310-9956-ffa450edef68

framework/src/org/apache/tapestry/util/JanitorThread.java

diff --git a/framework/src/org/apache/tapestry/util/JanitorThread.java b/framework/src/org/apache/tapestry/util/JanitorThread.java
index 229b765..2967472 100644
--- a/framework/src/org/apache/tapestry/util/JanitorThread.java
+++ b/framework/src/org/apache/tapestry/util/JanitorThread.java
@@ -168,17 +168,15 @@
      * successful, or false if the thread was interrupted (and should shut down).
      */
 
-    protected boolean waitForNextPass()
+    protected void waitForNextPass()
     {
         try
         {
             sleep(interval);
-
-            return true;
         }
         catch (InterruptedException ex)
         {
-            return false;
+            interrupt();
         }
     }
 
@@ -188,10 +186,9 @@
 
     public void run()
     {
-        while (true)
+        while (!isInterrupted())
         {
-            if (!waitForNextPass())
-                return;
+            waitForNextPass();
 
             sweep();
         }