From 978491938be17bd2dae650712b906587c6fb143a Mon Sep 17 00:00:00 2001 From: Yonik Seeley Date: Mon, 2 Nov 2015 18:41:02 +0000 Subject: [PATCH] SOLR-8203: use shutdownNow on updateExecutor git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1712111 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/java/org/apache/solr/update/UpdateShardHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java index a927ed5264d..f51d0301e2f 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java @@ -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 {