You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/02/28 07:40:28 UTC
svn commit: r1294483 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
Author: davsclaus
Date: Tue Feb 28 06:40:28 2012
New Revision: 1294483
URL: http://svn.apache.org/viewvc?rev=1294483&view=rev
Log:
CAMEL-5042: Shutting down a thread pool should remove the pool from the internal reference list
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 28 06:40:28 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1294483&r1=1294482&r2=1294483&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java Tue Feb 28 06:40:28 2012
@@ -252,6 +252,9 @@ public class DefaultExecutorServiceManag
LOG.debug("Shutdown ExecutorService: {}", executorService);
executorService.shutdown();
LOG.trace("Shutdown ExecutorService: {} complete.", executorService);
+
+ // remove reference as its shutdown
+ executorServices.remove(executorService);
}
@Override
@@ -266,6 +269,9 @@ public class DefaultExecutorServiceManag
List<Runnable> answer = executorService.shutdownNow();
LOG.trace("ShutdownNow ExecutorService: {} complete.", executorService);
+ // remove reference as its shutdown
+ executorServices.remove(executorService);
+
return answer;
}