Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 97161 invoked from network); 25 Apr 2008 14:43:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Apr 2008 14:43:19 -0000 Received: (qmail 61143 invoked by uid 500); 25 Apr 2008 14:43:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 61115 invoked by uid 500); 25 Apr 2008 14:43:19 -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 61103 invoked by uid 99); 25 Apr 2008 14:43:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2008 07:43:19 -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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2008 14:42:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A629E1A9832; Fri, 25 Apr 2008 07:42:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r651618 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Date: Fri, 25 Apr 2008 14:42:55 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080425144256.A629E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Fri Apr 25 07:42:45 2008 New Revision: 651618 URL: http://svn.apache.org/viewvc?rev=651618&view=rev Log: Apply patch for http://issues.apache.org/activemq/browse/AMQ-1690 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=651618&r1=651617&r2=651618&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 Fri Apr 25 07:42:45 2008 @@ -481,6 +481,11 @@ } } stopAllConnectors(stopper); + // remove any VMTransports connected + // this has to be done after services are stopped, + // to avoid timimg issue with discovery (spinning up a new instance) + BrokerRegistry.getInstance().unbind(getBrokerName()); + VMTransportFactory.stopped(getBrokerName()); stopper.stop(persistenceAdapter); if (broker != null) { stopper.stop(broker); @@ -502,11 +507,6 @@ } stopper.stop(getManagementContext()); } - // remove any VMTransports connected - // this has to be done after services are stopped, - // to avoid timimg issue with discovery (spinning up a new instance) - BrokerRegistry.getInstance().unbind(getBrokerName()); - VMTransportFactory.stopped(getBrokerName()); stopped.set(true); stoppedLatch.countDown(); LOG.info("ActiveMQ JMS Message Broker (" + getBrokerName() + ", " + brokerId + ") stopped");