Return-Path: 
 <commits-return-14735-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C85AA106C0
	for <apmail-jackrabbit-commits-archive@www.apache.org>;
 Sun,  9 Feb 2014 21:26:38 +0000 (UTC)
Received: (qmail 67508 invoked by uid 500); 9 Feb 2014 21:26:38 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 67455 invoked by uid 500); 9 Feb 2014 21:26:37 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 67448 invoked by uid 99); 9 Feb 2014 21:26:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Feb 2014 21:26:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Feb 2014 21:26:35 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 66D322388860;
	Sun,  9 Feb 2014 21:26:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1566430 -
 /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/QueryEngine.java
Date: Sun, 09 Feb 2014 21:26:14 -0000
To: commits@jackrabbit.apache.org
From: dbrosius@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140209212614.66D322388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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);
         }