You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by db...@apache.org on 2014/02/09 22:26:14 UTC

svn commit: r1566430 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java

Author: dbrosius
Date: Sun Feb  9 21:26:14 2014
New Revision: 1566430

URL: http://svn.apache.org/r1566430
Log:
guard against NPEs

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java?rev=1566430&r1=1566429&r2=1566430&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java Sun Feb  9 21:26:14 2014
@@ -246,7 +246,7 @@ public class QueryEngine {
                 merger.getRightSelectors());
 
         if (leftRows == null || leftRows.isEmpty()) {
-            return merger.merge(new RowIteratorAdapter(leftRows),
+            return merger.merge(new RowIteratorAdapter((leftRows == null) ? Collections.emptySet() : leftRows),
                     new RowIteratorAdapter(new TreeSet<Row>()), null, rightCo);
         }