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

[shalin]

Author: shalin
Date: Mon Jan 26 08:45:01 2009
New Revision: 737652

URL: http://svn.apache.org/viewvc?rev=737652&view=rev
Log:
SOLR-801 followup -- Fix for failing test

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=737652&r1=737651&r2=737652&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
 Mon Jan 26 08:45:01 2009
@@ -141,7 +141,6 @@
 
       root = e;
       String delQuery = e.allAttributes.get("preImportDeleteQuery");
-      if(delQuery == null) delQuery="*:*";
       if (dataImporter.getStatus() == DataImporter.Status.RUNNING_DELTA_DUMP
               && dataImporter.getLastIndexTime() != null) {
         cleanByQuery(delQuery , fullCleanDone);
@@ -655,7 +654,7 @@
     delQuery = getVariableResolver().replaceTokens(delQuery);
     if (requestParameters.clean) {
       if (delQuery == null && !completeCleanDone.get()) {
-        writer.deleteByQuery("*:*");
+        writer.doDeleteAll();
         completeCleanDone.set(true);
       } else {
         writer.deleteByQuery(delQuery);