QPID-1203: Add 08ExcludeList for external Java broker and make the profile use that.

Make AMQConnectionFactory take an optional clientid and use that if specified.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@680752 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 3 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 090620a560..01a915f2cc 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
@@ -293,14 +293,23 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
 
     public Connection createConnection(String userName, String password) throws JMSException
     {
+        return createConnection(userName, password, null);
+    }
+    
+    public Connection createConnection(String userName, String password, String id) throws JMSException
+    {
         try
         {
             if (_connectionDetails != null)
             {
                 _connectionDetails.setUsername(userName);
                 _connectionDetails.setPassword(password);
-
-                if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
+                
+                if (id != null && !id.equals(""))
+                {
+                    _connectionDetails.setClientName(id);
+                } 
+                else if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
                 {
                     _connectionDetails.setClientName(getUniqueClientID());
                 }
@@ -308,7 +317,7 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
             }
             else
             {
-                return new AMQConnection(_host, _port, userName, password, getUniqueClientID(), _virtualPath);
+                return new AMQConnection(_host, _port, userName, password, (id != null ? id : getUniqueClientID()), _virtualPath);
             }
         }
         catch (Exception e)