Author: mduerig
Date: Mon Nov 7 08:39:55 2016
New Revision: 1768446
URL: http://svn.apache.org/viewvc?rev=1768446&view=rev
Log:
OAK-5073: Bug in JcrPathParser
Test and fix for invalid parent traversal
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImpl.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImpl.java?rev=1768446&r1=1768445&r2=1768446&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImpl.java
Mon Nov 7 08:39:55 2016
@@ -315,7 +315,7 @@ public class NamePathMapperImpl implemen
return false;
}
- elements.remove(prevElem);
+ elements.remove(prevIdx);
return true;
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java?rev=1768446&r1=1768445&r2=1768446&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/NamePathMapperImplTest.java
Mon Nov 7 08:39:55 2016
@@ -99,6 +99,7 @@ public class NamePathMapperImplTest {
assertEquals("oak-jcr:content",
npMapper.getOakPath("foobar/./../{http://www.jcp.org/jcr/1.0}content";));
assertEquals("/a/b/c", npMapper.getOakPath("/a/b[1]/c[01]"));
assertEquals("/a/b[2]/c[3]", npMapper.getOakPath("/a[1]/b[2]/c[03]"));
+ assertEquals("/a/b", npMapper.getOakPath("/a/b/a/.."));
}
@Test
