[jbossws-commits] JBossWS SVN: r3826 - 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-07-09 12:32:37 -0400 (Mon, 09 Jul 2007)
New Revision: 3826

Modified:
   trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java
Log:
svn merge -r 3542:3544 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0

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-07-09 16:22:39 UTC (rev 3825)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java	2007-07-09 16:32:37 UTC (rev 3826)
@@ -257,8 +257,12 @@
 			appendRequiredHeader(soapHeader, ADDR.getActionQName(), getAction());
 			
 			// Write wsa:MessageID
-			if (getMessageID() != null)
+			if( (getReplyTo()!=null || getFaultTo()!=null) && null==getMessageID())
 			{
+				throw new AddressingException("Required addressing header missing:" + ADDR.getMessageIDQName());
+			}
+			else if (getMessageID() != null)
+			{
 				SOAPElement wsaMessageId = soapHeader.addChildElement(new NameImpl(ADDR.getMessageIDQName()));
 				wsaMessageId.addTextNode(getMessageID().getURI().toString());
 			}