[jboss-svn-commits] JBL Code SVN: r15311 - labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades.

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

Author: mark.little at jboss.com
Date: 2007-09-23 16:31:39 -0400 (Sun, 23 Sep 2007)
New Revision: 15311

Modified:
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1060

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java	2007-09-23 19:56:32 UTC (rev 15310)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/actions/impl/facades/FacadeUtil.java	2007-09-23 20:31:39 UTC (rev 15311)
@@ -135,28 +135,32 @@
 		else
 			throw new IllegalArgumentException("Unknown return jbpmObject in message");
 
-        //now for all entries in the map, lets see if we have the jbpm key name in the mapping
-		for (Iterator iterator = map.entrySet().iterator();  iterator.hasNext();)
+		if (map != null) // legal in jBPM see JBESB-1060
 		{
-			Map.Entry variable = (Map.Entry)iterator.next();
-			String keyInMsg = null;
-            if (mapping == null) {
-                keyInMsg = (String)variable.getKey();
-            } else {
-				keyInMsg = mapping.getEsbName((String)variable.getKey());
-            }
-			Object value = variable.getValue();
-			if (null!=keyInMsg && null!=value)
-			{
-                //set the object on the message
-                ObjectMapper objectMapper = new ObjectMapper();
-                try {
-                    objectMapper.setObjectOnMessage(message, keyInMsg, value);
-                } catch (ObjectMappingException ome) {
-                    throw new IllegalArgumentException(ome.getMessage(), ome);
-                }
-			}
+                //now for all entries in the map, lets see if we have the jbpm key name in the mapping
+        		for (Iterator iterator = map.entrySet().iterator();  iterator.hasNext();)
+        		{
+        			Map.Entry variable = (Map.Entry)iterator.next();
+        			String keyInMsg = null;
+                    if (mapping == null) {
+                        keyInMsg = (String)variable.getKey();
+                    } else {
+        				keyInMsg = mapping.getEsbName((String)variable.getKey());
+                    }
+        			Object value = variable.getValue();
+        			if (null!=keyInMsg && null!=value)
+        			{
+                        //set the object on the message
+                        ObjectMapper objectMapper = new ObjectMapper();
+                        try {
+                            objectMapper.setObjectOnMessage(message, keyInMsg, value);
+                        } catch (ObjectMappingException ome) {
+                            throw new IllegalArgumentException(ome.getMessage(), ome);
+                        }
+        			}
+        		}
 		}
+		
         //now remove the jBPM object from the message
         body.remove(Constants.JBPM_RETURN_OBJECT);
 	} // _______________________________