You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by ga...@locus.apache.org on 2000/11/27 19:21:57 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/functions FuncNamespace.java
garyp 00/11/27 10:21:55
Modified: java/src/org/apache/xpath/functions FuncNamespace.java
Log:
Fix check for namespace nodes. Avoid object creation for empty string.
Revision Changes Path
1.5 +8 -2 xml-xalan/java/src/org/apache/xpath/functions/FuncNamespace.java
Index: FuncNamespace.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncNamespace.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FuncNamespace.java 2000/11/16 20:51:29 1.4
+++ FuncNamespace.java 2000/11/27 18:21:53 1.5
@@ -98,9 +98,15 @@
}
else if(t == Node.ATTRIBUTE_NODE)
{
- s = xctxt.getDOMHelper().getNamespaceOfNode(context);
+
+ // This function always returns an empty string for namespace nodes.
+ // We check for those here. Fix inspired by Davanum Srinivas.
+
+ s = context.getNodeName();
if(s.startsWith("xmlns:") || s.equals("xmlns"))
return XString.EMPTYSTRING;
+
+ s = xctxt.getDOMHelper().getNamespaceOfNode(context);
}
else
return XString.EMPTYSTRING;
@@ -108,6 +114,6 @@
else
return XString.EMPTYSTRING;
- return new XString(s);
+ return ((null == s) ? XString.EMPTYSTRING : new XString(s));
}
}