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 no...@apache.org on 2010/02/10 06:27:01 UTC

svn commit: r908355 - in /lucene/solr/trunk/contrib/dataimporthandler: CHANGES.txt src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java

Author: noble
Date: Wed Feb 10 05:27:00 2010
New Revision: 908355

URL: http://svn.apache.org/viewvc?rev=908355&view=rev
Log:
* SOLR-1766: DIH with threads enabled doesn't respond to the abort command

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

Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=908355&r1=908354&r2=908355&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Wed Feb 10 05:27:00 2010
@@ -59,6 +59,8 @@
 
 * SOLR-1757: DIH multithreading sometimes throws NPE (noble)
 
+* SOLR-1766: DIH with threads enabled doesn't respond to the abort command (Michael Henson via noble)
+
 Other Changes
 ----------------------
 

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=908355&r1=908354&r2=908355&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 Wed Feb 10 05:27:00 2010
@@ -429,6 +429,7 @@
         DocWrapper docWrapper = this.docWrapper;
         Context.CURRENT_CONTEXT.set(context);
         for (; ;) {
+          if(DocBuilder.this.stop.get()) break;
           try {
             Map<String, Object> arow = epw.nextRow();
             if (arow == null) {