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 2012/07/14 09:58:12 UTC
svn commit: r1361490 -
/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Author: veithen
Date: Sat Jul 14 07:58:11 2012
New Revision: 1361490
URL: http://svn.apache.org/viewvc?rev=1361490&view=rev
Log:
OMNamespace#getPrefix() never returns null for OMNamespace instances found in an Axiom tree (only instances returned by OMFactory#createOMNamespace can have a null prefix).
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.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/SwitchingWrapper.java?rev=1361490&r1=1361489&r2=1361490&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Sat Jul 14 07:58:11 2012
@@ -224,7 +224,7 @@ class SwitchingWrapper extends AbstractX
return null;
} else {
String prefix = ns.getPrefix();
- return prefix == null || prefix.length() == 0 ? null : prefix;
+ return prefix.length() == 0 ? null : prefix;
}
} else {
throw new IllegalStateException();
@@ -552,7 +552,7 @@ class SwitchingWrapper extends AbstractX
if (isStartElement() || isEndElement()) {
loadNamespaces();
String prefix = namespaces[i].getPrefix();
- returnString = prefix == null || prefix.length() == 0 ? null : prefix;
+ returnString = prefix.length() == 0 ? null : prefix;
}
}
return returnString;
@@ -1430,7 +1430,7 @@ class SwitchingWrapper extends AbstractX
if (ns != null) {
String prefix = ns.getPrefix();
String uri = ns.getNamespaceURI();
- if ((prefix == null) || prefix.equals("")) {
+ if (prefix.length() == 0) {
returnName = new QName(uri, localPart);
} else {
returnName = new QName(uri, localPart, prefix);