You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/03/07 19:37:40 UTC
svn commit: r515689 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
Author: jstrachan
Date: Wed Mar 7 10:37:40 2007
New Revision: 515689
URL: http://svn.apache.org/viewvc?view=rev&rev=515689
Log:
rolled back change for AMQ-944 which breaks multicast group names
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java?view=diff&rev=515689&r1=515688&r2=515689
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java Wed Mar 7 10:37:40 2007
@@ -17,22 +17,18 @@
*/
package org.apache.activemq.transport.discovery.multicast;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Map;
-
import org.apache.activemq.transport.discovery.DiscoveryAgent;
import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
import org.apache.activemq.util.IOExceptionSupport;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Map;
public class MulticastDiscoveryAgentFactory extends DiscoveryAgentFactory {
- private static final Log log = LogFactory.getLog(MulticastDiscoveryAgentFactory.class);
-
protected DiscoveryAgent doCreateDiscoveryAgent(URI uri) throws IOException {
try {
@@ -40,15 +36,8 @@
MulticastDiscoveryAgent rc = new MulticastDiscoveryAgent();
rc.setGroup(uri.getHost());
- if ("default".equals(uri.getHost())) {
- log.info("Using default discovery uri " + uri);
-
- } else {
- // only set the discovery URI if a non-default multicast IP/port endpoint is being used.
- log.info("Setting discovery uri to " + uri);
- rc.setDiscoveryURI(uri);
- }
-
+ // allow the discoveryURI to be set via a query argument on the URI
+ // ?discoveryURI=someURI
IntrospectionSupport.setProperties(rc, options);
return rc;