[jboss-cvs] JBossAS SVN: r71580 - projects/ejb3/branches/cluster-dev/cache/src/main/java/org/jboss/ejb3/cache/impl/factory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-04-02 01:19:42 -0400 (Wed, 02 Apr 2008)
New Revision: 71580

Modified:
   projects/ejb3/branches/cluster-dev/cache/src/main/java/org/jboss/ejb3/cache/impl/factory/PassivationExpirationCoordinatorImpl.java
Log:
[EJBTHREE-1026] Don't run forever

Modified: projects/ejb3/branches/cluster-dev/cache/src/main/java/org/jboss/ejb3/cache/impl/factory/PassivationExpirationCoordinatorImpl.java
===================================================================
--- projects/ejb3/branches/cluster-dev/cache/src/main/java/org/jboss/ejb3/cache/impl/factory/PassivationExpirationCoordinatorImpl.java	2008-04-01 22:43:57 UTC (rev 71579)
+++ projects/ejb3/branches/cluster-dev/cache/src/main/java/org/jboss/ejb3/cache/impl/factory/PassivationExpirationCoordinatorImpl.java	2008-04-02 05:19:42 UTC (rev 71580)
@@ -132,46 +132,39 @@
    @Override
    public void run()
    {
-      while (!isStopped())
+      Set<PassivationExpirationProcessor> toProcess = new HashSet<PassivationExpirationProcessor>();
+      synchronized (processors)
       {
-         Set<PassivationExpirationProcessor> toProcess = new HashSet<PassivationExpirationProcessor>();
-         synchronized (processors)
-         {
-            toProcess.addAll(processors);
-         }
+         toProcess.addAll(processors);
+      }
+      
+      for (PassivationExpirationProcessor cache : toProcess)
+      {            
+         if (cache.isPassivationExpirationSelfManaged())
+            continue;
          
-         for (PassivationExpirationProcessor cache : toProcess)
-         {            
-            if (cache.isPassivationExpirationSelfManaged())
-               continue;
-            
-            PassivationExpirationTask task = new PassivationExpirationTask(cache, threadLimit);
-            if (threadLimit != null)
+         PassivationExpirationTask task = new PassivationExpirationTask(cache, threadLimit);
+         if (threadLimit != null)
+         {
+            // Limit the number of concurrent threads
+            try
             {
-               // Limit the number of concurrent threads
-               try
-               {
-                  threadLimit.acquire();
-               }
-               catch (InterruptedException ignore)
-               {
-               }
-               
-               if (isStopped())
-                  break;
-               
-               threadPool.run(task);
+               threadLimit.acquire();
             }
-            else
+            catch (InterruptedException ignore)
             {
-               // We run it our self
-               task.run();
             }
             
-            
             if (isStopped())
                break;
+            
+            threadPool.run(task);
          }
+         else
+         {
+            // We run it our self
+            task.run();
+         }
       }
    }