Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 44753 invoked from network); 10 Jul 2008 09:28:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jul 2008 09:28:05 -0000 Received: (qmail 55834 invoked by uid 500); 10 Jul 2008 09:28:05 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 55817 invoked by uid 500); 10 Jul 2008 09:28:05 -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 55808 invoked by uid 99); 10 Jul 2008 09:28:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 02:28:05 -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, 10 Jul 2008 09:27:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 78C092388A11; Thu, 10 Jul 2008 02:27:14 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r675484 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java Date: Thu, 10 Jul 2008 09:27:13 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080710092714.78C092388A11@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Thu Jul 10 02:27:09 2008 New Revision: 675484 URL: http://svn.apache.org/viewvc?rev=675484&view=rev Log: Fix for https://issues.apache.org/activemq/browse/AMQ-1848 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=675484&r1=675483&r2=675484&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Thu Jul 10 02:27:09 2008 @@ -431,10 +431,15 @@ break; case ConsumerInfo.DATA_STRUCTURE_TYPE: localStartedLatch.await(); - if (!addConsumerInfo((ConsumerInfo)command)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Ignoring ConsumerInfo: " + command); + if (started.get()) { + if (!addConsumerInfo((ConsumerInfo) command)) { + if (LOG.isDebugEnabled()) { + LOG.debug("Ignoring ConsumerInfo: "+ command); + } } + } else { + // received a subscription whilst stopping + LOG.warn("Stopping - ignoring ConsumerInfo: "+ command); } break; default: Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java?rev=675484&r1=675483&r2=675484&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java Thu Jul 10 02:27:09 2008 @@ -34,7 +34,7 @@ public class DuplexNetworkMBeanTest extends TestCase { protected static final Log LOG = LogFactory.getLog(DuplexNetworkMBeanTest.class); - protected final int numRestarts = 2; + protected final int numRestarts = 10; protected BrokerService createBroker() throws Exception { BrokerService broker = new BrokerService(); @@ -48,7 +48,7 @@ BrokerService broker = new BrokerService(); broker.setBrokerName("networkedBroker"); broker.addConnector("tcp://localhost:62617"); - NetworkConnector networkConnector = broker.addNetworkConnector("static://tcp://localhost:61617"); + NetworkConnector networkConnector = broker.addNetworkConnector("static:(tcp://localhost:61617)?maxReconnectDelay=1000&useExponentialBackOff=false"); networkConnector.setDuplex(true); return broker; } @@ -87,7 +87,7 @@ for (int i=0; i