You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2015/11/02 19:41:03 UTC
svn commit: r1712111 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
Author: yonik
Date: Mon Nov 2 18:41:02 2015
New Revision: 1712111
URL: http://svn.apache.org/viewvc?rev=1712111&view=rev
Log:
SOLR-8203: use shutdownNow on updateExecutor
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java?rev=1712111&r1=1712110&r2=1712111&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java Mon Nov 2 18:41:02 2015
@@ -110,7 +110,7 @@ public class UpdateShardHandler {
public void close() {
try {
- ExecutorUtil.shutdownAndAwaitTermination(updateExecutor);
+ ExecutorUtil.shutdownWithInterruptAndAwaitTermination(updateExecutor);
} catch (Exception e) {
SolrException.log(log, e);
} finally {