[jboss-svn-commits] JBL Code SVN: r33431 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel.

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

Author: dward
Date: 2010-06-09 17:21:23 -0400 (Wed, 09 Jun 2010)
New Revision: 33431

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelMessageComposer.java
Log:
Fix for JBESB-3342.


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelMessageComposer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelMessageComposer.java	2010-06-09 21:13:06 UTC (rev 33430)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/camel/CamelMessageComposer.java	2010-06-09 21:21:23 UTC (rev 33431)
@@ -58,7 +58,10 @@
 		// update esb properties from camel headers
 		Properties properties = esbMessageIn.getProperties();
 		for (Entry<String, Object> entry : camelMessageIn.getHeaders().entrySet()) {
-			properties.setProperty(entry.getKey(), entry.getValue());
+			Object value = entry.getValue();
+			if (value != null) {
+				properties.setProperty(entry.getKey(), value);
+			}
 		}
 		
 		// set esb body (payload) from camel body
@@ -89,7 +92,10 @@
 		// set camel headers from esb properties
 		Properties properties = esbMessageOut.getProperties();
 		for (String name : properties.getNames()) {
-			camelMessageOut.setHeader(name, properties.getProperty(name));
+			Object value = properties.getProperty(name);
+			if (value != null) {
+				camelMessageOut.setHeader(name, value);
+			}
 		}
 		
 		// set camel body from esb body (payload)