svn commit: r1701916 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java test/java/org/apache/jackrabbit/oak/query/ast/FullTextTest.java

[thomasm]

Author: thomasm
Date: Wed Sep  9 07:16:21 2015
New Revision: 1701916

URL: http://svn.apache.org/r1701916
Log:
OAK-3377 Two spaces in SQL2 fulltext search -> error

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/FullTextTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java?rev=1701916&r1=1701915&r2=1701916&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java
 Wed Sep  9 07:16:21 2015
@@ -163,7 +163,14 @@ public class FullTextParser {
                 } else if (c == '^') {
                     boost = "";
                     break;
-                } else if (c == ' ') {
+                } else if (c <= ' ') {
+                    while (parseIndex < text.length()) {
+                        c = text.charAt(parseIndex);
+                        if (c > ' ') {
+                            break;
+                        }
+                        parseIndex++;
+                    }
                     break;
                 } else {
                     buff.append(c);

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/FullTextTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/FullTextTest.java?rev=1701916&r1=1701915&r2=1701916&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/FullTextTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/ast/FullTextTest.java
 Wed Sep  9 07:16:21 2015
@@ -46,6 +46,9 @@ public class FullTextTest {
     @Test
     public void and() throws ParseException {
         assertEquals("\"hello\" \"world\"", convertPattern("hello world"));
+        assertEquals("\"hello\" \"world\"", convertPattern("hello  world"));
+        assertEquals("\"hello\" \"world\"", convertPattern("hello   world"));
+        assertEquals("\"hello\" \"world\"", convertPattern("hello \t  world"));
         assertEquals("\"hello\" \"or\" \"world\"", convertPattern("hello or 
world"));
         assertFalse(test("hello world", "hello"));
         assertFalse(test("hello world", "world"));