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 di...@apache.org on 2006/04/19 15:36:07 UTC

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

Author: dims
Date: Wed Apr 19 06:36:04 2006
New Revision: 395242

URL: http://svn.apache.org/viewcvs?rev=395242&view=rev
Log:
Fix for ADDR-25 - WS-Addressing - checkDuplicateHeaders call in AddressingInHandler not required


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

Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?rev=395242&r1=395241&r2=395242&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Wed Apr 19 06:36:04 2006
@@ -86,7 +86,7 @@
         
         // Per the SOAP Binding spec "headers with an incorrect cardinality MUST NOT be used" So these variables
         // are used to keep track of invalid cardinality headers so they are not deserialised.
-        boolean ignoreTo = false, ignoreFrom = false, ignoreReplyTo = false, ignoreFaultTo = false, ignoreMessageID = false, ignoreAction = false, ignoreRelatesTo = false; 
+        boolean ignoreTo = false, ignoreFrom = false, ignoreReplyTo = false, ignoreFaultTo = false, ignoreMessageID = false, ignoreAction = false; 
         
         // First pass just check for duplicates
         Iterator addressingHeadersIt = addressingHeaders.iterator();
@@ -107,8 +107,6 @@
 	            ignoreMessageID = checkDuplicateHeaders(WSA_MESSAGE_ID, checkedHeaderNames, duplicateHeaderNames);
 	        } else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName())) {
 	            ignoreAction = checkDuplicateHeaders(WSA_ACTION, checkedHeaderNames, duplicateHeaderNames);
-	        } else if (WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
-	            ignoreRelatesTo = checkDuplicateHeaders(WSA_RELATES_TO, checkedHeaderNames, duplicateHeaderNames);
 	        }
         }
         
@@ -133,7 +131,7 @@
             } else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName()) && !ignoreAction) {
                 messageContextOptions.setAction(soapHeaderBlock.getText());
                 soapHeaderBlock.setProcessed();
-            } else if (WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName()) && !ignoreRelatesTo) {
+            } else if (WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
                 extractRelatesToInformation(soapHeaderBlock, namespace, messageContextOptions);
             }
         }