[jboss-svn-commits] JBL Code SVN: r38120 - 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: 2012-06-07 16:59:09 -0400 (Thu, 07 Jun 2012)
New Revision: 38120

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/Bpm5Processor.java
Log:
JBESB-3792
Send the BPM parameters in a map on SIGNAL_EVENT.


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	2012-06-07 14:18:36 UTC (rev 38119)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/services/jbpm5/src/main/java/org/jboss/soa/esb/services/jbpm5/actions/Bpm5Processor.java	2012-06-07 20:59:09 UTC (rev 38120)
@@ -234,12 +234,18 @@
                 break;
 		    case SIGNAL_EVENT:
 				logger.info(ProcessConstants.SIGNAL_EVENT_TYPE);
+				Map<String, Object> eventParams = BpmParameterMapper.mapPropertiesToParams(message, configTree);
+				try {
+					eventParams.remove(ProcessConstants.PROCESS_EVENT);
+					eventParams.put(ProcessConstants.PROCESS_EVENT, message.getProperties().getProperty(ProcessConstants.PROCESS_EVENT));
+				} catch (Exception e) {					
+				}
+				
                 String processEventType = (String) message.getProperties().getProperty(ProcessConstants.PROCESS_EVENT_TYPE);
-                Object processEvent = message.getProperties().getProperty(ProcessConstants.PROCESS_EVENT);
                 processInstanceId = getProcessInstanceId(message);
 
 	            if (processInstanceId != null) {
-	                ksession.signalEvent(processEventType, processEvent, processInstanceId.longValue());
+	                ksession.signalEvent(processEventType, eventParams, processInstanceId.longValue());
 	            } else {
 	                throw new ConfigurationException(ProcessConstants.SIGNAL_EVENT_TYPE 
 	                    + ": tried to abort and process id was null");