From e61d6d0a55d022a0768e730521bfea36ad506f9d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 13 Jul 2016 14:16:36 +0000
Subject: [PATCH] dsreplication: Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
index 60262ae..6c98488 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
@@ -375,22 +375,11 @@
for (PreferredConnection connection : preferredLDAPURLs)
{
String url = connection.getLDAPURL();
- if (url.equalsIgnoreCase(adminConnectorUrl))
- {
- ldapUrls.add(connection);
- }
- else if (url.equalsIgnoreCase(ldapsUrl) &&
- connection.getType() == LDAPS)
- {
- ldapUrls.add(connection);
- }
- else if (url.equalsIgnoreCase(startTLSUrl) &&
- connection.getType() == START_TLS)
- {
- ldapUrls.add(connection);
- }
- else if (url.equalsIgnoreCase(ldapUrl) &&
- connection.getType() == LDAP)
+ org.opends.admin.ads.util.PreferredConnection.Type type = connection.getType();
+ if (url.equalsIgnoreCase(adminConnectorUrl)
+ || (url.equalsIgnoreCase(ldapsUrl) && type == LDAPS)
+ || (url.equalsIgnoreCase(startTLSUrl) && type == START_TLS)
+ || (url.equalsIgnoreCase(ldapUrl) && type == LDAP))
{
ldapUrls.add(connection);
}
--
Gitblit v1.10.0