Author: thomasm
Date: Thu Dec 22 11:15:20 2016
New Revision: 1775628
URL: http://svn.apache.org/viewvc?rev=1775628&view=rev
Log:
OAK-5260 Incorrect handling of subpaths with leading left curly bracket
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.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/JcrPathParser.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java?rev=1775628&r1=1775627&r2=1775628&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java
Thu Dec 22 11:15:20 2016
@@ -128,6 +128,10 @@ public final class JcrPathParser {
listener.error('\'' + jcrPath + "' is not a valid
path. '" + c +
"' not a valid name character.");
return false;
+ } else if (state == STATE_URI && c == EOF) {
+ // we reached EOF without finding the closing curly
brace '}'
+ listener.error('\'' + jcrPath + "' is not a valid
path. Missing '}'.");
+ return false;
}
break;
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=1775628&r1=1775627&r2=1775628&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
Thu Dec 22 11:15:20 2016
@@ -199,6 +199,36 @@ public class NamePathMapperImplTest {
}
@Test
+ public void testBracketsInPaths() throws Exception {
+ String[] paths = {
+ "/parent/childB1",
+ "/parent/}childB2",
+ "/parent/{childB3}",
+ "/parent/sub/childB4",
+ "/parent/sub/}childB5",
+ "/parent/sub/{childB6}",
+ };
+
+ for (String path : paths) {
+ assertEquals(path, npMapper.getOakPath(path));
+ }
+ }
+
+ @Test
+ public void testIllegalBracketsInPaths() throws Exception {
+ String[] paths = {
+ "/parent/sub/{childB7",
+ "/parent/sub/{childB7",
+ "/parent/{",
+ "/parent/{childA1",
+ "/parent/{{childA2" };
+
+ for (String path : paths) {
+ assertNull(npMapper.getOakPath(path));
+ }
+ }
+
+ @Test
public void testWhitespace() {
String[] paths = new String[] {
" leading", "trailing\n", " ", "\t",
