svn commit: r1750809 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java

[tommaso]

Author: tommaso
Date: Thu Jun 30 14:50:25 2016
New Revision: 1750809

URL: http://svn.apache.org/viewvc?rev=1750809&view=rev
Log:
OAK-4502 - relative indexes should still filter ACLs for 
spellchecks/suggestions on the full path

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1750809&r1=1750808&r2=1750809&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
 Thu Jun 30 14:50:25 2016
@@ -464,7 +464,11 @@ public class LucenePropertyIndex impleme
                             if (topDocs.totalHits > 0) {
                                 for (ScoreDoc doc : topDocs.scoreDocs) {
                                     Document retrievedDoc = 
searcher.doc(doc.doc);
-                                    if 
(filter.isAccessible(retrievedDoc.get(FieldNames.PATH))) {
+                                    String prefix = filter.getPath();
+                                    if (prefix.length() == 1) {
+                                        prefix = "";
+                                    }
+                                    if (filter.isAccessible(prefix + 
retrievedDoc.get(FieldNames.PATH))) {
                                         queue.add(new 
LuceneResultRow(suggestion.string));
                                         break;
                                     }
@@ -492,7 +496,11 @@ public class LucenePropertyIndex impleme
                             if (topDocs.totalHits > 0) {
                                 for (ScoreDoc doc : topDocs.scoreDocs) {
                                     Document retrievedDoc = 
searcher.doc(doc.doc);
-                                    if 
(filter.isAccessible(retrievedDoc.get(FieldNames.PATH))) {
+                                    String prefix = filter.getPath();
+                                    if (prefix.length() == 1) {
+                                        prefix = "";
+                                    }
+                                    if (filter.isAccessible(prefix + 
retrievedDoc.get(FieldNames.PATH))) {
                                         queue.add(new 
LuceneResultRow(suggestion.key.toString(), suggestion.value));
                                         break;
                                     }