[jbpm-commits] JBoss JBPM SVN: r2175 - in jbpm4/pvm/trunk/modules/core/src: main/java/org/jbpm/pvm/internal/jobexecutor and 1 other directories.

[do-not-reply at jboss.org]

Author: porcherg
Date: 2008-09-11 05:03:54 -0400 (Thu, 11 Sep 2008)
New Revision: 2175

Modified:
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
   jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java
Log:
make job execution use JobDbSession (to be sure the same dbSession is used to post jobs, to fetch jobs and to execute them when there are more than one DbSession in environment)

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java	2008-09-11 08:17:40 UTC (rev 2174)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java	2008-09-11 09:03:54 UTC (rev 2175)
@@ -31,6 +31,7 @@
 import org.jbpm.pvm.internal.cal.Duration;
 import org.jbpm.pvm.internal.env.JobContext;
 import org.jbpm.pvm.internal.jobexecutor.JobAddedNotification;
+import org.jbpm.pvm.internal.jobexecutor.JobDbSession;
 import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
 import org.jbpm.pvm.internal.log.Log;
 import org.jbpm.pvm.internal.util.Clock;
@@ -119,9 +120,9 @@
     if (repeat==null) {
       // delete the jobImpl
       if (log.isDebugEnabled()) log.debug("deleting " + this);
-      DbSession dbSession = environment.get(DbSession.class);
+      JobDbSession dbSession = environment.get(JobDbSession.class);
       if (dbSession==null) {
-        throw new PvmException("no "+DbSession.class.getName()+" in environment"); 
+        throw new PvmException("no "+JobDbSession.class.getName()+" in environment"); 
       }
       dbSession.delete(this);
 

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java	2008-09-11 08:17:40 UTC (rev 2174)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/ExecuteJobCmd.java	2008-09-11 09:03:54 UTC (rev 2175)
@@ -51,9 +51,9 @@
   }
 
   public Job execute(Environment environment) throws Exception {
-  	Session session = environment.get(Session.class);
+  	JobDbSession session = environment.get(JobDbSession.class);
   	if (session==null) {
-  	  throw new PvmException("no hibernate-session configured to get job "+jobDbid+" for execution");
+  	  throw new PvmException("no job session configured to get job "+jobDbid+" for execution");
   	}
     JobImpl<?> job = (JobImpl<?>) session.get(JobImpl.class, jobDbid);
 

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2008-09-11 08:17:40 UTC (rev 2174)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExceptionHandler.java	2008-09-11 09:03:54 UTC (rev 2175)
@@ -69,9 +69,9 @@
     log.debug("handling jobImpl "+jobDbid+" exception: "+exception.getMessage());
     
     // load the jobImpl from the db
-    Session session = environment.get(Session.class);
+    JobDbSession session = environment.get(JobDbSession.class);
     if (session==null) {
-      throw new PvmException("no hibernate-session configured to handle job");
+      throw new PvmException("no job-session configured to handle job");
     }
     JobImpl<?> job = (JobImpl<?>) session.get(JobImpl.class, jobDbid);
     // serialize the stack trace

Modified: jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java	2008-09-11 08:17:40 UTC (rev 2174)
+++ jbpm4/pvm/trunk/modules/core/src/test/java/org/jbpm/pvm/internal/jobexecutor/GenerateExceptionTestCommand.java	2008-09-11 09:03:54 UTC (rev 2175)
@@ -24,7 +24,6 @@
 import org.jbpm.pvm.env.Environment;
 import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.job.CommandMessage;
-import org.jbpm.pvm.internal.log.Log;
 import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;