From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 1a6c7c0..92cc9f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -320,12 +320,10 @@
// * num request handler
// Clear the stat tracker if LDAPv2 is being enabled.
- if (currentConfig.isAllowLDAPV2() != config.isAllowLDAPV2())
+ if (currentConfig.isAllowLDAPV2() != config.isAllowLDAPV2()
+ && config.isAllowLDAPV2())
{
- if (config.isAllowLDAPV2())
- {
- statTracker.clearStatistics();
- }
+ statTracker.clearStatistics();
}
// Apply the changes.
@@ -808,23 +806,20 @@
}
}
- if (config.isEnabled())
+ if (config.isEnabled()
+ // Check that the SSL configuration is valid.
+ && (config.isUseSSL() || config.isAllowStartTLS()))
{
- // Check that the SSL configuration is valid.
- if (config.isUseSSL() || config.isAllowStartTLS())
+ try
{
- try
- {
- SSLContext sslContext = createSSLContext(config);
- createSSLEngine(config, sslContext);
- }
- catch (DirectoryException e)
- {
- logger.traceException(e);
+ createSSLEngine(config, createSSLContext(config));
+ }
+ catch (DirectoryException e)
+ {
+ logger.traceException(e);
- unacceptableReasons.add(e.getMessageObject());
- return false;
- }
+ unacceptableReasons.add(e.getMessageObject());
+ return false;
}
}
--
Gitblit v1.10.0