1.4: Merged revision 680135 (JCR-1644)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/1.4/jackrabbit-core@682313 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 4, 2008 · d75ad2a · d75ad2a
1 parent 8cf7ac3
commit d75ad2a
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/main/java/org/apache/jackrabbit/core/xml/NamespaceContext.java b/src/main/java/org/apache/jackrabbit/core/xml/NamespaceContext.java
@@ -90,14 +90,15 @@ public NamespaceContext getParent() {
      * @throws NamespaceException if the prefix is not mapped
      */
     public String getURI(String prefix) throws NamespaceException {
-        String uri = (String) prefixToURI.get(prefix);
-        if (uri != null) {
-            return uri;
-        } else if (parent != null) {
-            return parent.getURI(prefix);
-        } else {
-            throw new NamespaceException("Unknown prefix: " + prefix);
+        NamespaceContext current = this;
+        while (current != null) {
+            String uri = (String) current.prefixToURI.get(prefix);
+            if (uri != null) {
+                return uri;
+            }
+            current = current.parent;
         }
+        throw new NamespaceException("Unknown prefix: " + prefix);
     }
 
     /**
@@ -108,13 +109,14 @@ public String getURI(String prefix) throws NamespaceException {
      * @throws NamespaceException if the URI is not mapped
      */
     public String getPrefix(String uri) throws NamespaceException {
-        String prefix = (String) uriToPrefix.get(uri);
-        if (prefix != null) {
-            return prefix;
-        } else if (parent != null) {
-            return parent.getPrefix(uri);
-        } else {
-            throw new NamespaceException("Unknown URI: " + uri);
+        NamespaceContext current = this;
+        while (current != null) {
+            String prefix = (String) current.uriToPrefix.get(uri);
+            if (prefix != null) {
+                return prefix;
+            }
+            current = current.parent;
         }
+        throw new NamespaceException("Unknown URI: " + uri);
     }
 }