[jboss-svn-commits] JBL Code SVN: r17761 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm.

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

Author: kevin.conner at jboss.com
Date: 2008-01-12 05:28:19 -0500 (Sat, 12 Jan 2008)
New Revision: 17761

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java
Log:
Take default values into account: JBESB-1431

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java	2008-01-12 06:20:04 UTC (rev 17760)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java	2008-01-12 10:28:19 UTC (rev 17761)
@@ -235,8 +235,10 @@
             value = objectMapper.getObjectFromMessage(message, mapping.getEsb());
         } catch (ObjectMappingException ome) {
             log.info(mapping.getEsb() + " not found");
-            value =mapping.getDefaultValue();
         }
+        if (value == null) {
+            value = mapping.getDefaultValue();
+        }
         log.debug("value=" + value);
         return value;
     }