Author: dejanb
Date: Thu Aug 12 12:19:31 2010
New Revision: 984738
URL: http://svn.apache.org/viewvc?rev=984738&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2598 - applying parameters for
composite urls in discovery agent
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?rev=984738&r1=984737&r2=984738&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
Thu Aug 12 12:19:31 2010
@@ -19,21 +19,23 @@ package org.apache.activemq.network;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.activemq.broker.SslContext;
import org.apache.activemq.command.DiscoveryEvent;
import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportDisposedIOException;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.discovery.DiscoveryAgent;
-import org.apache.activemq.transport.TransportDisposedIOException;
import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
import org.apache.activemq.transport.discovery.DiscoveryListener;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
import org.apache.activemq.util.URISupport;
+import org.apache.activemq.util.URISupport.CompositeData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,7 +63,12 @@ public class DiscoveryNetworkConnector e
public void setUri(URI discoveryURI) throws IOException {
setDiscoveryAgent(DiscoveryAgentFactory.createDiscoveryAgent(discoveryURI));
try {
- parameters = URISupport.parseParamters(discoveryURI);
+ CompositeData data = URISupport.parseComposite(discoveryURI);
+ parameters = new HashMap<String, String>();
+ parameters.putAll(data.getParameters());
+ for (URI uri : data.getComponents()) {
+ parameters.putAll(URISupport.parseParamters(uri));
+ }
// allow discovery agent to grab it's parameters
IntrospectionSupport.setProperties(getDiscoveryAgent(),
parameters);
} catch (URISyntaxException e) {
