[jboss-svn-commits] JBL Code SVN: r38275 - labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions.

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

Author: tcunning
Date: 2013-01-28 22:02:55 -0500 (Mon, 28 Jan 2013)
New Revision: 38275

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/AbstractBpm5Action.java
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/Bpm5Processor.java
Log:
JBESB-3900
In getSession(), use the existing session if the session ID in the message is the same as the one in the existing session.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/AbstractBpm5Action.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/AbstractBpm5Action.java	2013-01-18 16:21:49 UTC (rev 38274)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/AbstractBpm5Action.java	2013-01-29 03:02:55 UTC (rev 38275)
@@ -162,9 +162,12 @@
 	    StatefulKnowledgeSession ksession;
 	    
 		int sessionId = getSessionId(message);
-		if (sessionId >= 0) {
-	        kenvironment = getEnvironment(new HashMap<String, Object>());
-			ksession = JPAKnowledgeService.loadStatefulKnowledgeSession( sessionId, kbase, config, kenvironment );		
+
+		if (_ksession.getId() == sessionId) {
+			ksession = _ksession;
+		} else if (sessionId >= 0) {
+	        Environment tempEnv = getEnvironment(new HashMap<String, Object>());
+			ksession = JPAKnowledgeService.loadStatefulKnowledgeSession( sessionId, kbase, config, tempEnv );		
 		} else {		
 			ksession = _ksession;
 		}

Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/Bpm5Processor.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/Bpm5Processor.java	2013-01-18 16:21:49 UTC (rev 38274)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/Bpm5Processor.java	2013-01-29 03:02:55 UTC (rev 38275)
@@ -166,6 +166,7 @@
 
                 break;
 		}
+		ksession.fireAllRules();
 		
 		// Set Session and ProcessInstance information
 		message.getContext().setContext(ProcessConstants.SESSION_ID, sessionId);