diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-01-12 08:52:31 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-01-12 08:52:31 +0000 |
| commit | 3b44f4817b0c26bb798a1ad450b1fb6017d9beb7 (patch) | |
| tree | 0a8ebc679badd1420e8eb70c91798a62e4605ce5 /qpid/java/client/src/main | |
| parent | 8a263b314760622f624548303c2e642bac27b2cc (diff) | |
| download | qpid-python-3b44f4817b0c26bb798a1ad450b1fb6017d9beb7.tar.gz | |
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@495517 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java | 11 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java index e59b6fbe19..8fb87f9e64 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java +++ b/qpid/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/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index ca101cb3b5..b82a735f06 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/qpid/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, |