honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only force shutdown on cached threadpool if its not the same as the execture service

This commit is contained in:
kimchy 2010-12-23 16:13:05 +02:00
parent 42e8567477
commit e313379ed5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/elasticsearch/src/main/java/org/elasticsearch/threadpool/support/AbstractThreadPool.java
View File

@ -89,9 +89,7 @@ public abstract class AbstractThreadPool extends AbstractComponent implements Th
logger.debug("shutting down {} thread pool", getType());
executorService.shutdown();
scheduledExecutorService.shutdown();
if (!cached.isShutdown()) {
cached.shutdown();
}
cached.shutdown();
}
@Override public void shutdownNow() {
@ -102,14 +100,18 @@ public abstract class AbstractThreadPool extends AbstractComponent implements Th
if (!scheduledExecutorService.isTerminated()) {
scheduledExecutorService.shutdownNow();
}
if (!cached.isTerminated()) {
cached.shutdownNow();
if (cached != executorService) {
if (!cached.isTerminated()) {
cached.shutdownNow();
}
}
}
@Override public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
boolean result = executorService.awaitTermination(timeout, unit);
result &= cached.awaitTermination(timeout, unit);
if (cached != executorService) {
result &= cached.awaitTermination(timeout, unit);
}
result &= scheduledExecutorService.awaitTermination(timeout, unit);
return result;
}