Author: ritchiem
Date: Wed Nov 22 16:54:27 2006
New Revision: 478413
URL: http://svn.apache.org/viewvc?view=rev&rev=478413
Log:
Fix for Java TCK using createTopicConnection(username,password)
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java?view=diff&rev=478413&r1=478412&r2=478413
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
Wed Nov 22 16:54:27 2006
@@ -63,8 +63,8 @@
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 @@
else
{
return new AMQConnection(_host, _port, _defaultUsername,
_defaultPassword, getUniqueClientID(),
- _virtualPath);
+ _virtualPath);
}
}
catch (Exception e)
@@ -252,7 +252,21 @@
{
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)
{
