[jbpm-commits] JBoss JBPM SVN: r6919 - jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor.

[do-not-reply at jboss.org]

Author: jcoleman at redhat.com
Date: 2011-05-13 11:04:52 -0400 (Fri, 13 May 2011)
New Revision: 6919

Modified:
   jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/DispatcherThread.java
   jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
   jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
Log:
Remove testing code accidently commited with revision 6918.


Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/DispatcherThread.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/DispatcherThread.java	2011-05-13 14:49:57 UTC (rev 6918)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/DispatcherThread.java	2011-05-13 15:04:52 UTC (rev 6919)
@@ -101,7 +101,6 @@
           if (firstJob.getException() != null) {
             // decrease retry count
             int retries = firstJob.getRetries() - 1;
-log.info("Has exception, retries = " + retries);
             firstJob.setRetries(retries);
             if (debug) log.debug(firstJob + " has " + retries + " retries remaining");
           }

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java	2011-05-13 14:49:57 UTC (rev 6918)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutor.java	2011-05-13 15:04:52 UTC (rev 6919)
@@ -34,7 +34,7 @@
   protected int nbrOfThreads;
   protected int idleInterval;
   protected int maxIdleInterval;
-  private int retryInterval = 1000;
+  private int retryInterval;
   /** @deprecated property has no effect */
   protected int historyMaxSize;
 

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java	2011-05-13 14:49:57 UTC (rev 6918)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java	2011-05-13 15:04:52 UTC (rev 6919)
@@ -146,11 +146,7 @@
       }
 
       if (log.isDebugEnabled()) log.debug("executing " + job);
-/* XXX
       if (job.execute(jbpmContext)) jobSession.deleteJob(job);
-*/
-      jbpmContext.setRollbackOnly();
-      throw (new Exception());
     }
     catch (Exception e) {
       jbpmContext.setRollbackOnly();
@@ -190,7 +186,6 @@
       job.setLockTime(null);
       int waitPeriod = jobExecutor.getRetryInterval() / 2;
       waitPeriod += random.nextInt(waitPeriod) ;
-log.info("rescheduled: now + " + waitPeriod);
       job.setDueDate(new Date(System.currentTimeMillis() + waitPeriod)) ;
     }
     catch (RuntimeException e) {