You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2015/08/31 19:20:01 UTC
svn commit: r1700279 -
/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
Author: markrmiller
Date: Mon Aug 31 17:20:01 2015
New Revision: 1700279
URL: http://svn.apache.org/r1700279
Log:
SOLR-7956: Missed an interrupt shutdown on 5x backport.
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java?rev=1700279&r1=1700278&r2=1700279&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java Mon Aug 31 17:20:01 2015
@@ -298,16 +298,7 @@ public class OverseerTaskProcessor imple
isClosed = true;
if(tpe != null) {
if (!tpe.isShutdown()) {
- tpe.shutdown();
- try {
- tpe.awaitTermination(60, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- log.warn("Thread interrupted while waiting for OCP threadpool close.");
- Thread.currentThread().interrupt();
- } finally {
- if (!tpe.isShutdown())
- tpe.shutdownNow();
- }
+ ExecutorUtil.shutdownAndAwaitTermination(tpe);
}
}
}