diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2006-11-23 00:54:27 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2006-11-23 00:54:27 +0000 |
| commit | 6ffa3b5b9f0b8dbe7bc5cfe0919f43ea4543f8d1 (patch) | |
| tree | 5ff54c3b449b3e87f78cbee91844ccf593145f07 /java | |
| parent | d8f71e8605122f2bcc59dc22c8edb9740b01ac94 (diff) | |
| download | qpid-python-6ffa3b5b9f0b8dbe7bc5cfe0919f43ea4543f8d1.tar.gz | |
Fix for Java TCK using createTopicConnection(username,password)
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@478413 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java index 6829769b69..9e99734840 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java @@ -63,8 +63,8 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF String clientName, String virtualHost) throws URLSyntaxException { this(new AMQConnectionURL(ConnectionURL.AMQ_PROTOCOL + "://" + - username + ":" + password + "@" + clientName + - virtualHost + "?brokerlist='" + broker + "'")); + username + ":" + password + "@" + clientName + + virtualHost + "?brokerlist='" + broker + "'")); } public AMQConnectionFactory(String host, int port, String virtualPath) @@ -235,7 +235,7 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF else { return new AMQConnection(_host, _port, _defaultUsername, _defaultPassword, getUniqueClientID(), - _virtualPath); + _virtualPath); } } catch (Exception e) @@ -252,7 +252,21 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF { try { - return new AMQConnection(_host, _port, userName, password, getUniqueClientID(), _virtualPath); + if (_connectionDetails != null) + { + _connectionDetails.setUsername(userName); + _connectionDetails.setPassword(password); + + if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals("")) + { + _connectionDetails.setClientName(getUniqueClientID()); + } + return new AMQConnection(_connectionDetails); + } + else + { + return new AMQConnection(_host, _port, userName, password, getUniqueClientID(), _virtualPath); + } } catch (Exception e) { |