From c80441a3500dc1f38f99d11d3ee50ed0ad20b13c Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 12 Jan 2007 08:52:31 +0000 Subject: QPID-282 Updated AMQConnection and AMQBrokerDetails to check the host:port and add tcp:// if there is no protocol specified. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495517 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/client/AMQBrokerDetails.java | 11 +++++++++++ .../src/main/java/org/apache/qpid/client/AMQConnection.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'java/client/src/main') diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java index e59b6fbe19..8fb87f9e64 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java @@ -334,4 +334,15 @@ public class AMQBrokerDetails implements BrokerDetails } + public static String checkTransport(String broker) + { + if ((!broker.contains("://"))) + { + return "tcp://" + broker; + } + else + { + return broker; + } + } } diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index ca101cb3b5..b82a735f06 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java @@ -148,7 +148,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect this(new AMQConnectionURL(ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password + "@" + (clientName==null?"":clientName) + - virtualHost + "?brokerlist='" + broker + "'")); + virtualHost + "?brokerlist='" + AMQBrokerDetails.checkTransport(broker) + "'")); } public AMQConnection(String host, int port, String username, String password, -- cgit v1.2.1