From 6f4c0cf239c847a8b80c7cd6cda8bbae990c4d52 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 5 Feb 2012 20:53:37 +0000
Subject: NO-JIRA: remove test-only and unused connect methods

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240812 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/transport/ClientDelegate.java  |  2 +-
 .../main/java/org/apache/qpid/transport/Connection.java | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'qpid/java/common/src/main')

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 34ebdb441b..e732bee421 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -65,7 +65,7 @@ public class ClientDelegate extends ConnectionDelegate
     {
         Map<String,Object> clientProperties = new HashMap<String,Object>();
 
-        if(this._connectionSettings.getClientProperties() != null)
+        if(_connectionSettings.getClientProperties() != null)
         {
             clientProperties.putAll(_connectionSettings.getClientProperties());
         }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index 675c3e35b5..d9b94245e1 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -200,23 +200,12 @@ public class Connection extends ConnectionInvoker
         return saslClient;
     }
 
-    public void connect(String host, int port, String vhost, String username, String password)
+    public void connect(String host, int port, String vhost, String username, String password, boolean ssl, String saslMechs)
     {
-        connect(host, port, vhost, username, password, false);
+        connect(host, port, vhost, username, password, ssl, saslMechs, null);
     }
 
-    public void connect(String host, int port, String vhost, String username, String password, boolean ssl)
-    {
-        connect(host, port, vhost, username, password, ssl,"PLAIN");
-    }
-
-    public void connect(String host, int port, String vhost, String username, String password, boolean ssl,String saslMechs)
-    {
-        connect(host, port, vhost, username, password, ssl,saslMechs, Collections.EMPTY_MAP);
-    }
-
-
-    public void connect(String host, int port, String vhost, String username, String password, boolean ssl,String saslMechs,Map<String,Object> clientProps)
+    public void connect(String host, int port, String vhost, String username, String password, boolean ssl, String saslMechs, Map<String,Object> clientProps)
     {
         ConnectionSettings settings = new ConnectionSettings();
         settings.setHost(host);
-- 
cgit v1.2.1