MODE-2438 Added escaping for the + character when used in getNodes() …

…regexp.
ModeShape · Mar 24, 2015 · 310460f · 310460f
1 parent 9ff1b6c
commit 310460f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/modeshape-jcr/src/main/java/org/modeshape/jcr/AbstractJcrNode.java b/modeshape-jcr/src/main/java/org/modeshape/jcr/AbstractJcrNode.java
@@ -942,6 +942,7 @@ protected static List<?> createPatternsFor( String... namePatterns ) {
                         case '.':
                         case '{':
                         case '}':
+                        case '+':                            
                         case '\\':
                             sb.append("\\");
                             sb.append(c);

diff --git a/modeshape-jcr/src/test/java/org/modeshape/jcr/JcrNodeTest.java b/modeshape-jcr/src/test/java/org/modeshape/jcr/JcrNodeTest.java
@@ -458,10 +458,10 @@ public void shouldAllowSearchingForSNSViaRegex() throws Exception {
     }
 
     @Test
-    @FixFor("MODE-2069")
+    @FixFor( { "MODE-2069", "MODE-2438" } )
     public void shouldEscapeSpecialCharactersWhenSearchingNodesViaRegex() throws Exception {
         JcrRootNode rootNode = session.getRootNode();
-        Node specialNode = rootNode.addNode("special\t\r\n()\\?!^${}.\"");
+        Node specialNode = rootNode.addNode("special\t\r\n()\\?!^${}.\"+");
         session.save();
 
         try {
@@ -481,6 +481,7 @@ public void shouldEscapeSpecialCharactersWhenSearchingNodesViaRegex() throws Exc
             assertEquals(1, rootNode.getNodes("*{}*").getSize());
             assertEquals(1, rootNode.getNodes("*.*").getSize());
             assertEquals(1, rootNode.getNodes("*\"*").getSize());
+            assertEquals(1, rootNode.getNodes("*+*").getSize());
 
             assertEquals(0, rootNode.getNodes("*[*").getSize());
             assertEquals(0, rootNode.getNodes("*]*").getSize());