Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88EBB97E1 for ; Tue, 28 Feb 2012 06:40:54 +0000 (UTC) Received: (qmail 45408 invoked by uid 500); 28 Feb 2012 06:40:54 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 45323 invoked by uid 500); 28 Feb 2012 06:40:52 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 45301 invoked by uid 99); 28 Feb 2012 06:40:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 06:40:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 06:40:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DCE6723888D2; Tue, 28 Feb 2012 06:40:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294483 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java Date: Tue, 28 Feb 2012 06:40:28 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228064028.DCE6723888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 answer = executorService.shutdownNow(); LOG.trace("ShutdownNow ExecutorService: {} complete.", executorService); + // remove reference as its shutdown + executorServices.remove(executorService); + return answer; }