[jboss-svn-commits] JBL Code SVN: r33463 - labs/jbossesb/branches/JBESB_4_7_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg.

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

Author: kevin.conner at jboss.com
Date: 2010-06-12 03:59:00 -0400 (Sat, 12 Jun 2010)
New Revision: 33463

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java
Log:
count now applies to all dur jobs, not just suspended: JBESB-3347

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java	2010-06-12 07:49:31 UTC (rev 33462)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java	2010-06-12 07:59:00 UTC (rev 33463)
@@ -108,7 +108,6 @@
                 {
                     final Set<Long> monitoredJobs = new HashSet<Long>() ;
                     final long now = System.currentTimeMillis() ;
-                    int count = 0 ;
                     do
                     {
                         final Job job = jobSession.getFirstDueJob(RETRY_EXECUTOR, monitoredJobs) ;
@@ -119,7 +118,6 @@
                         monitoredJobs.add(Long.valueOf(job.getId())) ;
                         if (RETRY_EXECUTOR.equals(job.getLockOwner()))
                         {
-                            count++ ;
                             job.setLockOwner(null) ;
                             if (job instanceof Timer)
                             {
@@ -138,7 +136,7 @@
                             }
                         }
                     }
-                    while(count < maxRetryJobs) ;
+                    while(monitoredJobs.size() < maxRetryJobs) ;
                 }
             }
             catch (final Throwable th)