diff --git a/contrib/dataimporthandler/CHANGES.txt b/contrib/dataimporthandler/CHANGES.txt index 709dba9392b..c2a40d31931 100644 --- a/contrib/dataimporthandler/CHANGES.txt +++ b/contrib/dataimporthandler/CHANGES.txt @@ -59,6 +59,8 @@ Bug Fixes * 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 ---------------------- 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 42423a21e78..ab49f6b7ad1 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 @@ -429,6 +429,7 @@ public class DocBuilder { DocWrapper docWrapper = this.docWrapper; Context.CURRENT_CONTEXT.set(context); for (; ;) { + if(DocBuilder.this.stop.get()) break; try { Map arow = epw.nextRow(); if (arow == null) {