Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 5780 invoked from network); 5 Jun 2008 13:30:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jun 2008 13:30:20 -0000 Received: (qmail 44852 invoked by uid 500); 5 Jun 2008 13:30:23 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 44830 invoked by uid 500); 5 Jun 2008 13:30:23 -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 44821 invoked by uid 99); 5 Jun 2008 13:30:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jun 2008 06:30:22 -0700 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, 05 Jun 2008 13:29:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7C2AB2388A16; Thu, 5 Jun 2008 06:29:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r663604 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Date: Thu, 05 Jun 2008 13:29:59 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080605132959.7C2AB2388A16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Thu Jun 5 06:29:59 2008 New Revision: 663604 URL: http://svn.apache.org/viewvc?rev=663604&view=rev Log: Fix for https://issues.apache.org/activemq/browse/AMQ-1772 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=663604&r1=663603&r2=663604&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Thu Jun 5 06:29:59 2008 @@ -487,6 +487,11 @@ getBroker().brokerServiceStarted(); } catch (Exception e) { LOG.error("Failed to start ActiveMQ JMS Message Broker. Reason: " + e, e); + try{ + stop(); + }catch(Exception ex) { + LOG.warn("Failed to stop broker after failure in start ",ex); + } throw e; } }