svn commit: r1578431 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

[thomasm]

Author: thomasm
Date: Mon Mar 17 15:15:34 2014
New Revision: 1578431

URL: http://svn.apache.org/r1578431
Log:
OAK-622 Improve QueryIndex interface (bugfix)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java?rev=1578431&r1=1578430&r2=1578431&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java
 Mon Mar 17 15:15:34 2014
@@ -408,7 +408,7 @@ public class QueryImpl implements Query 
         RowIterator rowIt = new RowIterator(context.getBaseState());
         Comparator<ResultRowImpl> orderBy;
         boolean sortUsingIndex = false;
-        if (selectors.size() == 1) {
+        if (orderings != null && selectors.size() == 1) {
             IndexPlan plan = 
selectors.get(0).getExecutionPlan().getIndexPlan();
             if (plan != null) {
                 List<OrderEntry> list = plan.getSortOrder();