axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r375397 - /webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
Date Mon, 06 Feb 2006 22:19:02 GMT
Author: dims
Date: Mon Feb  6 14:18:59 2006
New Revision: 375397

URL: http://svn.apache.org/viewcvs?rev=375397&view=rev
Log:
was this working? :)

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=375397&r1=375396&r2=375397&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
Mon Feb  6 14:18:59 2006
@@ -47,7 +47,7 @@
         ArrayList addressingHeaders;
         try {
             addressingHeaders = header.getHeaderBlocksWithNSURI(Submission.WSA_NAMESPACE);
-            if (addressingHeaders != null) {
+            if (addressingHeaders != null && addressingHeaders.size() > 0) {
                 addressingNamespace = Submission.WSA_NAMESPACE;
                 extractCommonAddressingParameters(
                         header,
@@ -55,7 +55,7 @@
                         addressingHeaders, Submission.WSA_NAMESPACE);
             } else {
                 addressingHeaders = header.getHeaderBlocksWithNSURI(Final.WSA_NAMESPACE);
-                if (addressingHeaders != null) {
+                if (addressingHeaders != null && addressingHeaders.size() > 0)
{
                     addressingNamespace = Final.WSA_NAMESPACE;
                     extractCommonAddressingParameters(
                             header,
@@ -111,9 +111,8 @@
         Iterator headerBlocks = header.getChildren();
         while (headerBlocks.hasNext()) {
             SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) headerBlocks.next();
-            if (Final.WSA_TYPE_ATTRIBUTE_VALUE.equals(soapHeaderBlock.getAttribute(
-                                            new QName(Final.WSA_NAMESPACE,
-                                                    Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE)).getAttributeValue()))
{
+            OMAttribute attribute = soapHeaderBlock.getAttribute(new QName(Final.WSA_NAMESPACE,
Final.WSA_IS_REFERENCE_PARAMETER_ATTRIBUTE));
+            if (attribute != null && Final.WSA_TYPE_ATTRIBUTE_VALUE.equals(attribute.getAttributeValue()))
{
                 messageContextOptions.addReferenceParameter(soapHeaderBlock);
             }
         }



Mime
View raw message