Author: mlovett
Date: Thu Jan 4 06:24:17 2007
New Revision: 492579
URL: http://svn.apache.org/viewvc?view=rev&rev=492579
Log:
Avoid NPE from null body namespace, and remove unnecessary iterator
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java?view=diff&rev=492579&r1=492578&r2=492579
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/wsrm/RMElements.java
Thu Jan 4 06:24:17 2007
@@ -24,6 +24,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -344,13 +345,15 @@
// As a final resort check the body namespace
SOAPBody body = envelope.getBody();
if(body != null) {
- Iterator elements = body.getChildElements();
- if(elements.hasNext()) {
- OMElement firstBodyElement = (OMElement)
elements.next();
- String namespace =
firstBodyElement.getNamespace().getNamespaceURI();
-
if(namespace.equals(Sandesha2Constants.SPEC_2005_02.NS_URI) ||
-
namespace.equals(Sandesha2Constants.SPEC_2006_08.NS_URI) ) {
- return namespace;
+ OMElement element = body.getFirstElement();
+ if(element != null) {
+ OMNamespace namespace = element.getNamespace();
+ if(namespace != null) {
+ String uri =
namespace.getNamespaceURI();
+
if(Sandesha2Constants.SPEC_2005_02.NS_URI.equals(uri) ||
+
Sandesha2Constants.SPEC_2006_08.NS_URI.equals(uri) ) {
+ return uri;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
