svn commit: r681078 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/transport/fanout/ test/java/org/apache/activemq/transport/fanout/

[hadrian]

Author: hadrian
Date: Wed Jul 30 08:07:52 2008
New Revision: 681078

URL: http://svn.apache.org/viewvc?rev=681078&view=rev
Log:
AMQ-1464

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java?rev=681078&r1=681077&r2=681078&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
 Wed Jul 30 08:07:52 2008
@@ -77,7 +77,7 @@
     private int maxReconnectAttempts;
     private Exception connectionFailure;
     private FanoutTransportHandler primary;
-    private boolean fanOutQueues;
+    private boolean fanOutQueues = false;
 
     static class RequestCounter {
 

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java?rev=681078&r1=681077&r2=681078&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransportFactory.java
 Wed Jul 30 08:07:52 2008
@@ -63,11 +63,11 @@
      */
     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;

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java?rev=681078&r1=681077&r2=681078&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
 Wed Jul 30 08:07:52 2008
@@ -57,7 +57,7 @@
 
     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 @@
     }
 
     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);