You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2008/02/18 14:14:10 UTC

svn commit: r628715 - /webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java

Author: pradine
Date: Mon Feb 18 05:14:08 2008
New Revision: 628715

URL: http://svn.apache.org/viewvc?rev=628715&view=rev
Log:
Either @Addressing or @SubmissionAddressing can require
WS-Addressing headers to be sent with incoming requests.

Modified:
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java?rev=628715&r1=628714&r2=628715&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java Mon Feb 18 05:14:08 2008
@@ -66,10 +66,8 @@
                 boolean w3cAddressingRequired = addressing.required();
                 boolean submissionAddressingRequired = submissionAddressing.required();
 
-                if (w3cAddressingRequired && submissionAddressingRequired)
+                if (w3cAddressingRequired || submissionAddressingRequired)
                 	addressingRequired = AddressingConstants.ADDRESSING_REQUIRED;
-                else if (w3cAddressingRequired || submissionAddressingRequired)
-                	throw ExceptionFactory.makeWebServiceException("Illegal configuration.");
             }
             else if (w3cAddressingEnabled) {
             	namespace.setValue(AddressingConstants.Final.WSA_NAMESPACE);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org