Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-3107 - make sure advisories work for bridges created by duplex 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1054096 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-12-31 11:18:14 +00:00
parent 2a2dcd5ec4
commit 3e15501439
3 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -148,7 +148,6 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
this.duplexInitiatingConnection = connection;
start();
serviceRemoteCommand(remoteBrokerInfo);
brokerService.getBroker().networkBridgeStarted(remoteBrokerInfo);
}
public void start() throws Exception {

43
activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.java Normal file
View File

@ -0,0 +1,43 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.broker.advisory;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import java.net.URI;
public class AdvisoryDuplexNetworkBridgeTest extends AdvisoryNetworkBridgeTest {
@Override
public void createBroker1() throws Exception {
broker1 = new BrokerService();
broker1.setBrokerName("broker1");
broker1.addConnector("tcp://localhost:61617");
broker1.setUseJmx(false);
broker1.setPersistent(false);
broker1.start();
broker1.waitUntilStarted();
}
@Override
public void createBroker2() throws Exception {
broker2 = BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/duplexLocalBroker.xml"));
broker2.start();
broker2.waitUntilStarted();
}
}

21
activemq-core/src/test/java/org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.java
View File

@ -36,9 +36,7 @@ public class AdvisoryNetworkBridgeTest extends TestCase {
public void testAdvisory() throws Exception {
broker1 = BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/reconnect-broker1.xml"));
broker1.start();
broker1.waitUntilStarted();
createBroker1();
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://broker1");
Connection conn = factory.createConnection();
@ -48,9 +46,7 @@ public class AdvisoryNetworkBridgeTest extends TestCase {
Thread.sleep(1000);
broker2 = BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/reconnect-broker2.xml"));
broker2.start();
broker2.waitUntilStarted();
createBroker2();
ActiveMQMessage advisory = (ActiveMQMessage)consumer.receive(2000);
assertNotNull(advisory);
@ -67,6 +63,19 @@ public class AdvisoryNetworkBridgeTest extends TestCase {
}
public void createBroker1() throws Exception {
broker1 = BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/reconnect-broker1.xml"));
broker1.start();
broker1.waitUntilStarted();
}
public void createBroker2() throws Exception {
broker2 = BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/reconnect-broker2.xml"));
broker2.start();
broker2.waitUntilStarted();
}
@Override
protected void tearDown() throws Exception {
broker1.stop();