[jboss-svn-commits] JBL Code SVN: r7801 - labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml

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

Author: kevin.conner at jboss.com
Date: 2006-11-23 12:16:57 -0500 (Thu, 23 Nov 2006)
New Revision: 7801

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
Log:
Fix for text node processing: JBESB-237

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2006-11-23 17:12:17 UTC (rev 7800)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java	2006-11-23 17:16:57 UTC (rev 7801)
@@ -11,6 +11,7 @@
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /*
@@ -140,7 +141,6 @@
 					if (!(xxx instanceof Element))
 						continue;
 					Element child = (Element) xxx;
-
 					if (child.getNodeName().equals(BYTES_TAG))
 					{
 						CDATASection cdata = (CDATASection) child.getFirstChild();
@@ -149,9 +149,13 @@
 					}
 					else
 					{
-						Object value = child.getFirstChild();
-						if (value instanceof Element) {
-							value = MarshalUnmarshalManager.getInstance().unmarshal((Element) child.getFirstChild());
+						Node node = child.getFirstChild();
+						while(!(node instanceof Element))
+						{
+							node = node.getNextSibling() ;
+						}
+						if (node instanceof Element) {
+							final Object value = MarshalUnmarshalManager.getInstance().unmarshal((Element)node);
 							if (value == null)
 								throw new UnmarshalException("Cannot unpack object "+child.getNodeName());
 							else