OMNamespace#getPrefix() never returns null for OMNamespace instances found in an Axiom tree (only instances returned by OMFactory#createOMNamespace can have a null prefix).
diff --git a/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java b/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
index 0ad2ab0..8a65ca5 100644
--- a/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
+++ b/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
@@ -224,7 +224,7 @@
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 @@
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 @@
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);
