Author: bradsdavis
Date: 2010-09-30 16:15:46 -0400 (Thu, 30 Sep 2010)
New Revision: 6720
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/job/SignalTokenJob.hbm.xml
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java
Log:
Added check from job listener to command. Added different discriminator to the process.
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/job/SignalTokenJob.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/job/SignalTokenJob.hbm.xml 2010-09-30
17:02:18 UTC (rev 6719)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/job/SignalTokenJob.hbm.xml 2010-09-30
20:15:46 UTC (rev 6720)
@@ -7,7 +7,7 @@
<hibernate-mapping auto-import="false" default-access="field">
<subclass name="org.jbpm.job.SignalTokenJob"
- discriminator-value="T"
+ discriminator-value="S"
extends="org.jbpm.job.Job" />
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java 2010-09-30
17:02:18 UTC (rev 6719)
+++
jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java 2010-09-30
20:15:46 UTC (rev 6720)
@@ -39,8 +39,12 @@
long jobId = message.getLongProperty("jobId");
return new ExecuteJobCommand(jobId);
}
+ else if(super.extractCommand(message)!=null)
+ {
+ return super.extractCommand(message);
+ }
else {
- log.warn("property jobId not found");
+ log.warn("property jobId not found and command not found.");
}
return null;
}