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

[sh...@apache.org]

Author: shalin
Date: Wed Oct 29 00:16:42 2008
New Revision: 708810

URL: http://svn.apache.org/viewvc?rev=708810&view=rev
Log:
Moving abort outside of importLock. Abort does not need to acquire a lock.

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

Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=708810&r1=708809&r2=708810&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java Wed Oct 29 00:16:42 2008
@@ -385,19 +385,22 @@
   }
 
   void runCmd(RequestParams reqParams, SolrWriter sw, Map<String, String> variables) {
+    String command = reqParams.command;
+    if (command.equals(ABORT_CMD)) {
+      if (docBuilder != null) {
+        docBuilder.abort();
+      }
+      return;
+    }
     if (!importLock.tryLock())
       return;
     try {
-      String command = reqParams.command;
       Date lastModified = sw.loadIndexStartTime();
       setLastIndexTime(lastModified);
       if (command.equals("full-import")) {
         doFullImport(sw, reqParams, variables);
       } else if (command.equals(DELTA_IMPORT_CMD)) {
         doDeltaImport(sw, reqParams, variables);
-      } else if (command.equals(ABORT_CMD)) {
-        if (docBuilder != null)
-          docBuilder.abort();
       }
     } finally {
       importLock.unlock();