Author: veithen
Date: Wed Apr 8 20:17:56 2009
New Revision: 763376
URL: http://svn.apache.org/viewvc?rev=763376&view=rev
Log:
Fixed an issue in OMStAXWrapper#getNamespaceURI(String): The method always did
the lookup on the root node instead of the current node.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/conformance/namespaces.xml
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java?rev=763376&r1=763375&r2=763376&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMStAXWrapper.java
Wed Apr 8 20:17:56 2009
@@ -845,9 +845,10 @@
if (isStartElement() || isEndElement()
|| (currentEvent == NAMESPACE)) {
- if (rootNode instanceof OMElement) {
+ OMNode node = getNode();
+ if (node instanceof OMElement) {
OMNamespace namespaceURI =
- ((OMElement) rootNode).findNamespaceURI(prefix);
+ ((OMElement) node).findNamespaceURI(prefix);
return namespaceURI != null ?
namespaceURI.getNamespaceURI() : null;
}
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/conformance/namespaces.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/conformance/namespaces.xml?rev=763376&r1=763375&r2=763376&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/conformance/namespaces.xml
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/conformance/namespaces.xml
Wed Apr 8 20:17:56 2009
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
-<a xmlns='urn:ns1' xmlns:ns2='urn:ns2' ns2:att='test'><ns2:b att='test'/></a>
\ No newline at end of file
+<a xmlns='urn:ns1' xmlns:ns2='urn:ns2' ns2:att='test'><ns2:b att='test'><ns3:c
xmlns:ns3='urn:ns3'/></ns2:b></a>
\ No newline at end of file
