activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject git commit: Fixing regression due to chagnes in AMQ-4718. You now have to prefix option that need to passed to the nested urls by prefixing those options with 'nested.'
Date Wed, 18 Sep 2013 14:14:12 GMT
Updated Branches:
  refs/heads/trunk 1bc55049e -> 5215fc21d


Fixing regression due to chagnes in AMQ-4718.  You now have to prefix option that need to
passed to the nested urls by prefixing those options with 'nested.'


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5215fc21
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5215fc21
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5215fc21

Branch: refs/heads/trunk
Commit: 5215fc21d6e4f973bc48110dd8f9aad7ed6b0ced
Parents: 1bc5504
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Wed Sep 18 10:13:59 2013 -0400
Committer: Hiram Chirino <hiram@hiramchirino.com>
Committed: Wed Sep 18 10:14:07 2013 -0400

----------------------------------------------------------------------
 .../activemq/transport/failover/FailoverTransportFactory.java    | 4 ++--
 .../src/main/java/org/apache/activemq/util/URISupport.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/5215fc21/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
index 8276b45..c2778ce 100755
--- a/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/failover/FailoverTransportFactory.java
@@ -70,12 +70,12 @@ public class FailoverTransportFactory extends TransportFactory {
 
     public FailoverTransport createTransport(Map<String, String> parameters) throws
IOException {
         FailoverTransport transport = new FailoverTransport();
+        Map<String, Object> nestedExtraQueryOptions = IntrospectionSupport.extractProperties(parameters,
"nested.");
         IntrospectionSupport.setProperties(transport, parameters);
         try {
-            transport.setNestedExtraQueryOptions(URISupport.createQueryString(parameters));
+            transport.setNestedExtraQueryOptions(URISupport.createQueryString(nestedExtraQueryOptions));
         } catch (URISyntaxException e) {
         }
-        parameters.clear();
         return transport;
     }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/5215fc21/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java b/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java
index 765be86..aa93044 100755
--- a/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java
+++ b/activemq-client/src/main/java/org/apache/activemq/util/URISupport.java
@@ -488,7 +488,7 @@ public class URISupport {
      * @return a URI formatted query string.
      * @throws URISyntaxException
      */
-    public static String createQueryString(Map<String, String> options) throws URISyntaxException
{
+    public static String createQueryString(Map<String, ? extends Object> options) throws
URISyntaxException {
         try {
             if (options.size() > 0) {
                 StringBuffer rc = new StringBuffer();


Mime
View raw message