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

AMQ-1464 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@681078 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hadrian Zbarcea 2008-07-30 15:07:52 +00:00
parent dc03bad9f4
commit ecfae00e3c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
View File

@ -77,7 +77,7 @@ public class FanoutTransport implements CompositeTransport {
private int maxReconnectAttempts;
private Exception connectionFailure;
private FanoutTransportHandler primary;
private boolean fanOutQueues;
private boolean fanOutQueues = false;
static class RequestCounter {

6
activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
View File

@ -63,11 +63,11 @@ public class FanoutTransportFactory extends TransportFactory {
*/
public Transport createTransport(URI location) throws IOException, URISyntaxException {
CompositeData compositData = URISupport.parseComposite(location);
Map<String, String> parameters = new HashMap<String, String>(compositData.getParameters());
CompositeData compositeData = URISupport.parseComposite(location);
Map<String, String> parameters = new HashMap<String, String>(compositeData.getParameters());
DiscoveryTransport transport = new DiscoveryTransport(createTransport(parameters));
DiscoveryAgent discoveryAgent = DiscoveryAgentFactory.createDiscoveryAgent(compositData.getComponents()[0]);
DiscoveryAgent discoveryAgent = DiscoveryAgentFactory.createDiscoveryAgent(compositeData.getComponents()[0]);
transport.setDiscoveryAgent(discoveryAgent);
return transport;

4
activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
View File

@ -57,7 +57,7 @@ public class FanoutTransportBrokerTest extends NetworkTestSupport {
public void initCombosForTestPublisherFansout() {
addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST")});
addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"), new ActiveMQQueue("TEST")});
}
public void testPublisherFansout() throws Exception {
@ -193,7 +193,7 @@ public class FanoutTransportBrokerTest extends NetworkTestSupport {
}
protected StubConnection createFanoutConnection() throws Exception {
URI fanoutURI = new URI("fanout://static://(" + connector.getServer().getConnectURI() + "," + "mock://" + remoteConnector.getServer().getConnectURI() + ")");
URI fanoutURI = new URI("fanout://(static://(" + connector.getServer().getConnectURI() + "," + "mock://" + remoteConnector.getServer().getConnectURI() + "))?fanOutQueues=true");
Transport transport = TransportFactory.connect(fanoutURI);
StubConnection connection = new StubConnection(transport);
connections.add(connection);