[jboss-svn-commits] JBL Code SVN: r12690 - in labs/jbossesb/trunk/product/core/rosetta/src/org/jboss: soa/esb/addressing and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-06-19 08:26:19 -0400 (Tue, 19 Jun 2007)
New Revision: 12690

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java
Log:
Fix RelatesTo serialisation: JBESB-637

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java	2007-06-19 08:23:04 UTC (rev 12689)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/CallHelper.java	2007-06-19 12:26:19 UTC (rev 12690)
@@ -80,7 +80,7 @@
 			final Element relatesToElement = doc.createElementNS(
 					XMLUtil.WSA_NAMESPACE_URI, XMLUtil.RELATES_TO_TAG);
 			relatesToElement.setPrefix(XMLUtil.WSA_PREFIX);
-			relatesToElement.setNodeValue(call.getRelatesTo().toString());
+			relatesToElement.setTextContent(call.getRelatesTo().toString());
 			header.appendChild(relatesToElement);
 		}
 
@@ -145,19 +145,15 @@
 	
 				if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.RELATES_TO_TAG)))
 				{
-                                        final String value = n.getNodeValue() ;
-                                        if (value != null)
-                                        {
-        					try
-        					{
-        						call.setRelatesTo(new URI(value));
-        					}
-        					catch (URISyntaxException e)
-        					{
-        						throw new UnmarshalException("'" + XMLUtil.RELATES_TO_TAG
-        								+ "' must be a valid URI", e);
-        					}
-                                        }
+    					try
+    					{
+    						call.setRelatesTo(new URI(n.getTextContent()));
+    					}
+    					catch (URISyntaxException e)
+    					{
+    						throw new UnmarshalException("'" + XMLUtil.RELATES_TO_TAG
+    								+ "' must be a valid URI", e);
+    					}
 				}
 	
 				if (n.getPrefix().equals(XMLUtil.WSA_PREFIX) && (n.getLocalName().equals(XMLUtil.FAULT_TO_TAG)))

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java	2007-06-19 08:23:04 UTC (rev 12689)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java	2007-06-19 12:26:19 UTC (rev 12690)
@@ -248,7 +248,7 @@
 	
 	public String toString ()
 	{
-		return "To: "+_to+", From: "+_from+", ReplyTo: "+_replyTo+", FaultTo: "+_faultTo+", Action: "+_action+", MessagdID: "+_messageID;
+		return "To: "+_to+", From: "+_from+", ReplyTo: "+_replyTo+", FaultTo: "+_faultTo+", Action: "+_action+", MessageID: "+_messageID+", RelatesTo: "+_relatesTo;
 	}
 	
 	/**
@@ -273,4 +273,4 @@
 	private URI _action = null;
 	private URI _messageID = null;
 	
-} 
\ No newline at end of file
+}