summaryrefslogtreecommitdiff
path: root/gnu/xml/xpath/LocalNameFunction.java
diff options
context:
space:
mode:
authorChris Burdess <dog@bluezoo.org>2006-01-11 22:05:45 +0000
committerChris Burdess <dog@bluezoo.org>2006-01-11 22:05:45 +0000
commit9ab6dda09af55000166d8b71e4bd1a3e217abea7 (patch)
treee82718cb707435ad83c5b7b524d08f45220f9764 /gnu/xml/xpath/LocalNameFunction.java
parenta893d288730ef922e45b205be43ef8e91ad69077 (diff)
downloadclasspath-9ab6dda09af55000166d8b71e4bd1a3e217abea7.tar.gz
2006-01-11 Chris Burdess <dog@gnu.org>
* gnu/xml/transform/AttributeNode.java, gnu/xml/transform/ElementNode.java, gnu/xml/transform/LiteralNode.java, gnu/xml/transform/StreamSerializer.java, gnu/xml/transform/StrippingInstruction.java, gnu/xml/transform/Stylesheet.java, gnu/xml/transform/TransformerImpl.java, gnu/xml/transform/ValueOfNode.java, gnu/xml/xpath/Expr.java, gnu/xml/xpath/LocalNameFunction.java, gnu/xml/xpath/NameFunction.java, gnu/xml/xpath/NameTest.java, gnu/xml/xpath/NamespaceUriFunction.java, gnu/xml/xpath/NodeTypeTest.java, gnu/xml/xpath/SubstringFunction.java, javax/xml/namespace/QName.java: don't determine element namespace from namespace aliases when specified; better namespace handling when serializing elements; don't create HTML meta element unless head element exists; correct encoding of CDATA sections containing ']]>'; encode HTML character entity references; use ISO-Latin-1 as default encoding for HTML output; rewrite of XSLT strip-space/preserve-space handling; correct doctype-public and doctype-system output attributes; insert generated doctype before document element; fixed result tree whitespace stripping algorithm; fixed semantics of XPath name, local-name, and namespace-uri functions; name tests handle XML/XMLNS namespaces correctly; fixed semantics of processing-instruction node test. * gnu/xml/transform/TransformerFactoryImpl.java: Add main method to aid debugging.
Diffstat (limited to 'gnu/xml/xpath/LocalNameFunction.java')
-rw-r--r--gnu/xml/xpath/LocalNameFunction.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/xml/xpath/LocalNameFunction.java b/gnu/xml/xpath/LocalNameFunction.java
index f8ace9cd5..84fb6d482 100644
--- a/gnu/xml/xpath/LocalNameFunction.java
+++ b/gnu/xml/xpath/LocalNameFunction.java
@@ -1,5 +1,5 @@
/* LocalNameFunction.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004,2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,6 +38,7 @@ exception statement from your version. */
package gnu.xml.xpath;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import javax.xml.namespace.QName;
import org.w3c.dom.Node;
@@ -70,7 +71,8 @@ final class LocalNameFunction
public Object evaluate(Node context, int pos, int len)
{
- Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
+ Object val = (arg == null) ? Collections.singleton(context) :
+ arg.evaluate(context, pos, len);
return _local_name(context, (Collection) val);
}