1 files changed, 9 insertions, 0 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index 60e4a5960a..65208722d7 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
@@ -275,6 +275,15 @@ public class AMQConnectionURL implements ConnectionURL
             sb.append(URLHelper.printOptions(_failoverOptions));
             sb.append("'");
         }
+        
+        for (String key : _options.keySet())
+        {
+            if (!key.equals(OPTIONS_FAILOVER) || !key.equals(OPTIONS_BROKERLIST))
+            {
+                sb.append(URLHelper.DEFAULT_OPTION_SEPERATOR).append(key).append("='");
+                sb.append(_options.get(key)).append("'");
+            }
+        }
 
         return sb.toString();
     }