svn commit: r642553 - /activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java

[djencks]

Author: djencks
Date: Sat Mar 29 09:34:25 2008
New Revision: 642553

URL: http://svn.apache.org/viewvc?rev=642553&view=rev
Log:
AMQ-1489 revert previous attempted fix and add comment about possible workaround

Modified:
    
activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java

Modified: 
activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
URL: 
http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java?rev=642553&r1=642552&r2=642553&view=diff
==============================================================================
--- 
activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
 (original)
+++ 
activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
 Sat Mar 29 09:34:25 2008
@@ -28,14 +28,21 @@
 import org.apache.activemq.util.URISupport;
 
 public class MulticastDiscoveryAgentFactory extends DiscoveryAgentFactory {
-
+    
+    //See AMQ-1489. There's something wrong here but it is difficult to tell 
what.
+    //It looks like to actually set the discovery URI you have to use 
something like
+    //<transportConnector uri="..." 
discoveryUri="multicast://239.3.7.0:37000?discoveryURI=multicast://239.3.7.0:37000"
 />
+    // or
+    //<networkConnector name="..." 
uri="multicast://239.3.7.0:37000?discoveryURI=multicast://239.3.7.0:37000">
     protected DiscoveryAgent doCreateDiscoveryAgent(URI uri) throws 
IOException {
         try {
             
             Map options = URISupport.parseParamters(uri);
             MulticastDiscoveryAgent rc = new MulticastDiscoveryAgent();
-            rc.setDiscoveryURI(uri);
             rc.setGroup(uri.getHost());
+
+            // allow the discoveryURI to be set via a query argument on the URI
+            // ?discoveryURI=someURI
             IntrospectionSupport.setProperties(rc, options);
             return rc;