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

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

Author: kevin.conner at jboss.com
Date: 2011-08-31 13:30:40 -0400 (Wed, 31 Aug 2011)
New Revision: 37446

Modified:
   labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/job/ExecuteTimerCommand.java
Log:
Check for expired timer before accessing, port of SOA-3072

Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/job/ExecuteTimerCommand.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/job/ExecuteTimerCommand.java	2011-08-30 15:06:39 UTC (rev 37445)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/job/ExecuteTimerCommand.java	2011-08-31 17:30:40 UTC (rev 37446)
@@ -62,18 +62,19 @@
      */
     public Object execute(JbpmContext jbpmContext) throws Exception {
       Timer timer = jbpmContext.getJobSession().loadTimer(timerId);
+      // Check for deleted timer before accessing
+      if (JobUtil.isDeleted(timer)) {
+        if (log.isDebugEnabled()) {
+          log.debug("timer " + timerId + " was deleted");
+        }
+        return null;
+      }
       
       // register process instance for automatic save
       // see https://jira.jboss.org/jira/browse/JBPM-1015
       ProcessInstance processInstance = timer.getProcessInstance();
       jbpmContext.addAutoSaveProcessInstance(processInstance);
       
-      if (JobUtil.isDeleted(timer)) {
-        if (log.isDebugEnabled()) {
-          log.debug("timer " + timerId + " was deleted");
-        }
-        return null;
-      }
       if (timer.isSuspended()) {
         if (log.isDebugEnabled()) {
           log.debug(timer + " is suspended");