Author: davidillsley
Date: Wed Nov  8 06:20:13 2006
New Revision: 472502

URL: http://svn.apache.org/viewvc?view=rev&rev=472502
Log:
Further fix for AXIS2-1292
If a header block does not have an assocaited namespace, ignore it if
getHeaderBlocksWithNSURI is called with a non-null parameter rather
than NullPointering.

Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java?view=diff&rev=472502&r1=472501&r2=472502
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
 Wed Nov  8 06:20:13 2006
@@ -210,8 +210,12 @@
                     if(namespace == null) {
                         headers.add(header);
                     }
-                } else if (nsURI.equals(namespace.getNamespaceURI())) {
-                    headers.add(header);
+                } else{
+                    if(namespace!=null){
+                        if (nsURI.equals(namespace.getNamespaceURI())) {
+                            headers.add(header);
+                        }
+                    }
                 }
             }
             node = node.getNextOMSibling();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to