You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2011/12/17 16:46:01 UTC
svn commit: r1215516 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom...
Author: veithen
Date: Sat Dec 17 15:46:01 2011
New Revision: 1215516
URL: http://svn.apache.org/viewvc?rev=1215516&view=rev
Log:
QName#getNamespaceURI() never returns null.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenLegacyQNameIterator.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenLegacyQNameIterator.java Sat Dec 17 15:46:01 2011
@@ -50,7 +50,7 @@ public class OMChildrenLegacyQNameIterat
((currentQName != null) && currentQName.getLocalPart().equals(localPart));
String namespaceURI = searchQName.getNamespaceURI();
- boolean namespaceURIMatch = (namespaceURI == null) || (namespaceURI.equals(""))||
+ boolean namespaceURIMatch = (namespaceURI.equals(""))||
((currentQName != null) && currentQName.getNamespaceURI().equals(namespaceURI));
return localNameMatch && namespaceURIMatch;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/traverse/OMChildrenQNameIterator.java Sat Dec 17 15:46:01 2011
@@ -85,7 +85,7 @@ public class OMChildrenQNameIterator ext
boolean localNameMatch =(localPart == null) || (localPart.equals("")) ||
((currentQName != null) && currentQName.getLocalPart().equals(localPart));
String namespaceURI = searchQName.getNamespaceURI();
- boolean namespaceURIMatch = (namespaceURI == null) || (namespaceURI.equals(""))||
+ boolean namespaceURIMatch = (namespaceURI.equals(""))||
((currentQName != null) && currentQName.getNamespaceURI().equals(namespaceURI));
return localNameMatch && namespaceURIMatch;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenLegacyQNameIterator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenLegacyQNameIterator.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenLegacyQNameIterator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenLegacyQNameIterator.java Sat Dec 17 15:46:01 2011
@@ -50,7 +50,7 @@ public class OMChildrenLegacyQNameIterat
((currentQName != null) && currentQName.getLocalPart().equals(localPart));
String namespaceURI = searchQName.getNamespaceURI();
- boolean namespaceURIMatch = (namespaceURI == null) || (namespaceURI.equals(""))||
+ boolean namespaceURIMatch = (namespaceURI.equals(""))||
((currentQName != null) && currentQName.getNamespaceURI().equals(namespaceURI));
return localNameMatch && namespaceURIMatch;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMChildrenQNameIterator.java Sat Dec 17 15:46:01 2011
@@ -88,7 +88,7 @@ public class OMChildrenQNameIterator ext
boolean localNameMatch =(localPart == null) || (localPart.equals("")) ||
((currentQName != null) && currentQName.getLocalPart().equals(localPart));
String namespaceURI = searchQName.getNamespaceURI();
- boolean namespaceURIMatch = (namespaceURI == null) || (namespaceURI.equals(""))||
+ boolean namespaceURIMatch = (namespaceURI.equals(""))||
((currentQName != null) && currentQName.getNamespaceURI().equals(namespaceURI));
return localNameMatch && namespaceURIMatch;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Sat Dec 17 15:46:01 2011
@@ -932,8 +932,7 @@ public class ElementImpl extends ParentN
return null;
}
- if (qname.getNamespaceURI() == null
- || qname.getNamespaceURI().equals("")) {
+ if (qname.getNamespaceURI().equals("")) {
return (AttrImpl) this.getAttributeNode(qname.getLocalPart());
} else {
return (AttrImpl) this.getAttributeNodeNS(qname.getNamespaceURI(),
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java Sat Dec 17 15:46:01 2011
@@ -290,9 +290,8 @@ public class SOAPEnvelopeImpl extends SO
if (payloadQName != null) {
if (SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(payloadQName.getLocalPart())) {
String ns = payloadQName.getNamespaceURI();
- return (ns != null &&
- (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns) ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns)));
+ return SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns) ||
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Sat Dec 17 15:46:01 2011
@@ -155,10 +155,9 @@ public class OMElementImpl extends OMNod
// first try to find a namespace from the scope
String namespaceURI = qname.getNamespaceURI();
- if (namespaceURI != null && namespaceURI.length() > 0) {
+ if (namespaceURI.length() > 0) {
String prefix = qname.getPrefix();
- ns = findNamespace(qname.getNamespaceURI(),
- prefix);
+ ns = findNamespace(namespaceURI, prefix);
/**
* What is left now is
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1215516&r1=1215515&r2=1215516&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Sat Dec 17 15:46:01 2011
@@ -293,9 +293,8 @@ public class SOAPEnvelopeImpl extends SO
if (payloadQName != null) {
if (SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(payloadQName.getLocalPart())) {
String ns = payloadQName.getNamespaceURI();
- return (ns != null &&
- (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns) ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns)));
+ return SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns) ||
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns);
}
}