From a7e5e371915be741db2dac2656b779dba93bf9f9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Jul 2016 13:03:33 +0000
Subject: [PATCH] ConnectionWrapper.java: simplified code

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
index 607cb99..0728c1a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
@@ -86,11 +86,10 @@
     {
       ConnectionRecord cr = connectionTable.get(key);
       if (cr.conn != null
-          && conn.getHostPort().equals(cr.conn.getHostPort())
+          && cr.conn.getHostPort().equals(conn.getHostPort())
           && cr.conn.getBindDn().equals(conn.getBindDn())
           && cr.conn.getBindPassword().equals(conn.getBindPassword())
-          && cr.conn.isSSL() == conn.isSSL()
-          && cr.conn.isStartTLS() == conn.isStartTLS())
+          && cr.conn.getConnectionType() == conn.getConnectionType())
       {
         return true;
       }

--
Gitblit v1.10.0