You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/11/08 15:05:13 UTC

(jackrabbit-oak) 01/01: OAK-10544: oak-jcr: remapping a namespace prefix leaves namespace resolver in broken state

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-10544
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit c5eb6980558baa99f8e6474e4d05121260688e5b
Author: Julian Reschke <re...@apache.org>
AuthorDate: Wed Nov 8 16:04:32 2023 +0100

    OAK-10544: oak-jcr: remapping a namespace prefix leaves namespace resolver in broken state
---
 .../java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java   | 1 +
 oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java   | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
index d64f78f1a8..2631ad2c72 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
@@ -81,6 +81,7 @@ public class LocalNameMapper extends GlobalNameMapper {
                     for (int i = 2; true; i++) {
                         String jcrPrefix = oakPrefix + i;
                         if (!local.containsKey(jcrPrefix)) {
+                            local.put(jcrPrefix, uri);
                             return jcrPrefix + oakName.substring(colon);
                         }
                     }
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
index 88262e392d..d3ee2f900c 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NamePathTest.java
@@ -37,7 +37,6 @@ import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
 import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class NamePathTest {
@@ -219,7 +218,6 @@ public class NamePathTest {
     }
 
     @Test
-    @Ignore("OAK-10544")
     public void testPrefixRemapping() throws NamespaceException, RepositoryException {
         Random r = new Random();
         int i1 = r.nextInt();