From 19d7b267a7069bf7ff5bd9427d6d218a8c817126 Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Tue, 24 Feb 2009 11:19:51 +0000
Subject: [PATCH] SOLR-801 follow-up -- Fix NullPointerException in case of
 multiple root entities when deleteQuery is not specified

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@747343 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/solr/handler/dataimport/DocBuilder.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
index 8538240e70a..64046dc7a89 100644
--- a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
+++ b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
@@ -700,7 +700,7 @@ public class DocBuilder {
       if (delQuery == null && !completeCleanDone.get()) {
         writer.doDeleteAll();
         completeCleanDone.set(true);
-      } else {
+      } else if (delQuery != null) {
         writer.deleteByQuery(delQuery);
       }
     }