Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 64482 invoked from network); 12 Nov 2009 11:35:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Nov 2009 11:35:27 -0000 Received: (qmail 6800 invoked by uid 500); 12 Nov 2009 11:35:27 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 6781 invoked by uid 500); 12 Nov 2009 11:35:26 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 6772 invoked by uid 99); 12 Nov 2009 11:35:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2009 11:35:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 12 Nov 2009 11:35:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 88EA223888FD; Thu, 12 Nov 2009 11:35:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r835342 - /activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Date: Thu, 12 Nov 2009 11:35:03 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091112113503.88EA223888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Thu Nov 12 11:35:03 2009 New Revision: 835342 URL: http://svn.apache.org/viewvc?rev=835342&view=rev Log: merging 835339 : https://issues.apache.org/activemq/browse/AMQ-2486 - systemExitOnShutdown hangs Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=835342&r1=835341&r2=835342&view=diff ============================================================================== --- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original) +++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Thu Nov 12 11:35:03 2009 @@ -435,7 +435,7 @@ if (systemExitOnShutdown) { addShutdownHook(new Runnable() { public void run() { - System.exit(systemExitOnShutdownExitCode); + Runtime.getRuntime().halt(systemExitOnShutdownExitCode); } }); }