[jbossws-commits] JBossWS SVN: r3543 - trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-06-12 04:32:04 -0400 (Tue, 12 Jun 2007)
New Revision: 3543

Modified:
   trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
Log:
Rely on AddressingException's

Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java	2007-06-12 08:25:32 UTC (rev 3542)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java	2007-06-12 08:32:04 UTC (rev 3543)
@@ -68,17 +68,17 @@
 	private String getRequiredHeaderContent(SOAPHeader soapHeader, QName qname)
 	{
 		Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
-		if(null == element) throw new IllegalArgumentException("Required element "+qname+" is missing");
+		if(null == element) throw new AddressingException("Required element "+qname+" is missing");
 
 		String value = DOMUtils.getTextContent(element);
-		if(null == value || value.equals("")) throw new IllegalArgumentException("Required element "+qname+" is missing");
+		if(null == value || value.equals("")) throw new AddressingException("Required element "+qname+" is missing");
 		
 		return value;
 	}
 
 	private String getOptionalHeaderContent(SOAPHeader soapHeader, QName qname)
 	{
-		Element element = DOMUtils.getFirstChildElement(soapHeader, ADDR.getMessageIDQName());
+		Element element = DOMUtils.getFirstChildElement(soapHeader, qname);
 		if (element != null)
 		{
 			return DOMUtils.getTextContent(element);