svn commit: r1503165 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java

[th...@apache.org]

Author: thomasm
Date: Mon Jul 15 10:20:34 2013
New Revision: 1503165

URL: http://svn.apache.org/r1503165
Log:
OAK-890 Query: advanced fulltext search conditions

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java?rev=1503165&r1=1503164&r2=1503165&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryResultImpl.java Mon Jul 15 10:20:34 2013
@@ -175,15 +175,15 @@ public class QueryResultImpl implements 
     @Override
     public NodeIterator getNodes() throws RepositoryException {
         String[] selectorNames = getSelectorNames();
-        final String selectorName = selectorNames[0];
         if (getSelectorNames().length > 1) {
-            // use the first selector
-            // TODO verify using the first selector is allowed according to the specification,
+            // TODO verify using the last selector is allowed according to the specification,
             // otherwise just allow it when using XPath queries, or make XPath queries
             // look like they only contain one selector
             // throw new RepositoryException("Query contains more than one selector: " +
             //        Arrays.toString(getSelectorNames()));
         }
+        // use the last selector
+        final String selectorName = selectorNames[selectorNames.length - 1];
         Iterator<NodeImpl<NodeDelegate>> nodeIterator = new Iterator<NodeImpl<NodeDelegate>>() {
 
             private final Iterator<? extends ResultRow> it = result.getRows().iterator();