You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/02/24 12:19:51 UTC

svn commit: r747343 - /lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java

Author: shalin
Date: Tue Feb 24 11:19:51 2009
New Revision: 747343

URL: http://svn.apache.org/viewvc?rev=747343&view=rev
Log:
SOLR-801 follow-up -- Fix NullPointerException in case of multiple root entities when deleteQuery is not specified

Modified:
    lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java

Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=747343&r1=747342&r2=747343&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Tue Feb 24 11:19:51 2009
@@ -700,7 +700,7 @@
       if (delQuery == null && !completeCleanDone.get()) {
         writer.doDeleteAll();
         completeCleanDone.set(true);
-      } else {
+      } else if (delQuery != null) {
         writer.deleteByQuery(delQuery);
       }
     }