You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2007/02/23 15:54:16 UTC

svn commit: r510966 - /webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java

Author: davidillsley
Date: Fri Feb 23 06:54:16 2007
New Revision: 510966

URL: http://svn.apache.org/viewvc?view=rev&rev=510966
Log:
Apologies, made a change just before commit which I thought would be harmless.

Modified:
    webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?view=diff&rev=510966&r1=510965&r2=510966
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Fri Feb 23 06:54:16 2007
@@ -86,7 +86,7 @@
         if(log.isTraceEnabled()){
     		log.trace("Addressing version string from messageContext="+addressingVersionFromCurrentMsgCtxt);
     	}
-        boolean isFinalAddressingNamespace = Final.WSA_NAMESPACE.equals(addressingVersionFromCurrentMsgCtxt);
+        boolean isSubmissionNamespace = Submission.WSA_NAMESPACE.equals(addressingVersionFromCurrentMsgCtxt);
         
         // Determine whether to include optional addressing headers in the output.
         boolean includeOptionalHeaders = this.includeOptionalHeaders;
@@ -104,7 +104,7 @@
         // headers if there are any (this was the case so far).
         boolean replaceHeaders = Utils.isExplicitlyTrue(msgContext, REPLACE_ADDRESSING_HEADERS);
 
-        WSAHeaderWriter writer = new WSAHeaderWriter(msgContext, isFinalAddressingNamespace, addMustUnderstandAttribute, replaceHeaders, includeOptionalHeaders);
+        WSAHeaderWriter writer = new WSAHeaderWriter(msgContext, isSubmissionNamespace, addMustUnderstandAttribute, replaceHeaders, includeOptionalHeaders);
         writer.writeHeaders();
         
         return InvocationResponse.CONTINUE;
@@ -127,9 +127,9 @@
     	private boolean replaceHeaders;  // determines whether we replace the existing headers or not, if they present
     	private boolean includeOptionalHeaders;
     	
-    	public WSAHeaderWriter(MessageContext mc, boolean isFinal, boolean addMU, boolean replace, boolean includeOptional) {
+    	public WSAHeaderWriter(MessageContext mc, boolean isSubmissionNamespace, boolean addMU, boolean replace, boolean includeOptional) {
     		if(log.isDebugEnabled()){
-        		log.debug("WSAHeaderWriter: isFinal="+isFinal+" addMU="+addMU+" replace="+replace+" includeOptional="+includeOptional);
+        		log.debug("WSAHeaderWriter: isFinal="+isSubmissionNamespace+" addMU="+addMU+" replace="+replace+" includeOptional="+includeOptional);
         	}
     		
     		messageContext = mc;
@@ -145,10 +145,10 @@
             
             messageContextOptions = messageContext.getOptions();
             
-            addressingNamespace = (isFinal?Final.WSA_NAMESPACE:Submission.WSA_NAMESPACE);
+            addressingNamespace = (isSubmissionNamespace?Submission.WSA_NAMESPACE:Final.WSA_NAMESPACE);
             addressingNamespaceObject = factory.createOMNamespace(addressingNamespace, WSA_DEFAULT_PREFIX);
 
-            isFinalAddressingNamespace = isFinal;
+            isFinalAddressingNamespace = !isSubmissionNamespace;
             addMustUnderstandAttribute = addMU;
             replaceHeaders = replace;
             includeOptionalHeaders = includeOptional;



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