You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2012/03/28 16:23:58 UTC
svn commit: r1306367 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
Author: jukka
Date: Wed Mar 28 14:23:58 2012
New Revision: 1306367
URL: http://svn.apache.org/viewvc?rev=1306367&view=rev
Log:
2.4: Merged revision 1306337 (JCR-3280)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1306337
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java?rev=1306367&r1=1306366&r2=1306367&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java Wed Mar 28 14:23:58 2012
@@ -245,6 +245,11 @@ public class QueryEngine {
Comparator<Row> rightCo = new RowPathComparator(
merger.getRightSelectors());
+ if (leftRows == null || leftRows.isEmpty()) {
+ return merger.merge(new RowIteratorAdapter(leftRows),
+ new RowIteratorAdapter(new TreeSet<Row>()), null, rightCo);
+ }
+
Set<Row> rightRows = buildRightRowsJoin(csInfo, rightConstraints,
isOuterJoin, rightCo, printIndentation + printIndentStep);