[jboss-svn-commits] JBL Code SVN: r8775 - labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers

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

Author: kevin.conner at jboss.com
Date: 2007-01-09 11:52:03 -0500 (Tue, 09 Jan 2007)
New Revision: 8775

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
Log:
Change to EPR processing

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java	2007-01-09 16:14:42 UTC (rev 8774)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/helpers/EPRHelper.java	2007-01-09 16:52:03 UTC (rev 8775)
@@ -135,23 +135,21 @@
 
 		try
 		{
-			NodeList children = header.getChildNodes();
-
-			for (int i = 0; i < children.getLength(); i++)
+			if (to)
 			{
-				Node n = children.item(i);
-				
-				if (n instanceof Element)
+				NodeList children = header.getChildNodes();
+	
+				for (int i = 0; i < children.getLength(); i++)
 				{
-					Element el = (Element) n;
-
-					if (el.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.TO_TAG))
-						return getSpecificEPR(new EPR(PortReferenceHelper.fromXML(el, true)), header);
-					else
+					Node n = children.item(i);
+					
+					if (n instanceof Element)
 					{
-						if (el.getNodeName().contains(XMLUtil.WSA_PREFIX+":"))
-							return getSpecificEPR(new EPR(PortReferenceHelper.fromXML(el, false)));
-					}	
+						Element el = (Element) n;
+	
+						if (el.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.TO_TAG))
+							return getSpecificEPR(new EPR(PortReferenceHelper.fromXML(el, true)), header);
+					}
 				}
 			}
 			
@@ -199,17 +197,23 @@
 					.newInstance();
 			DocumentBuilder builder = factory.newDocumentBuilder();
 			Document doc = builder.newDocument();
-			Element header = doc.createElement("header");
 			Element portReferenceElement = doc.createElementNS(XMLUtil.WSA_NAMESPACE_URI, XMLUtil.WSA_PREFIX+":"+tag);
 			
 			setSpecificEPR(epr);
 
-			doc.appendChild(header);
-
-			toXML(epr, doc, header, portReferenceElement, to);
+			if (to)
+			{
+				Element header = doc.createElement("header");
+				doc.appendChild(header);
+				toXML(epr, doc, header, portReferenceElement, to);
+				header.appendChild(portReferenceElement);
+			}
+			else
+			{
+				doc.appendChild(portReferenceElement) ;
+				toXML(epr, doc, portReferenceElement, portReferenceElement, to);
+			}
 			
-			header.appendChild(portReferenceElement);
-			
 			StringWriter sWriter = new StringWriter();
 			OutputFormat format = new OutputFormat();
 			format.setIndenting(true);
@@ -271,31 +275,8 @@
 			Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes()));
 			Element rootElement = (Element) doc.getDocumentElement();
 
-			NodeList children = rootElement.getChildNodes();
-
-			for (int i = 0; i < children.getLength(); i++)
-			{
-				Node n = children.item(i);
-				
-				if (n instanceof Element)
-				{
-					Element el = (Element) n;
-					
-					if (el.getNodeName().equals(XMLUtil.WSA_PREFIX+":"+XMLUtil.TO_TAG))
-						return getSpecificEPR(new EPR(PortReferenceHelper.fromXML(el, true)), rootElement);
-					else
-						return getSpecificEPR(new EPR(PortReferenceHelper.fromXML(el, false)));
-				}
-			}
-			
-			return getSpecificEPR(new EPR(PortReferenceHelper.fromXML(rootElement, to)));
+			return fromXML(rootElement, to) ;
 		}
-		catch (MarshalException ex)
-		{
-			ex.printStackTrace();
-
-			return null;
-		}
 		catch (SAXException ex)
 		{
 			ex.printStackTrace();