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/http/HTTPConnectionHandler.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
index f22ffce..beddd43 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -543,22 +543,18 @@
}
}
- if (config.isEnabled())
+ if (config.isEnabled() && config.isUseSSL())
{
- // Check that the SSL configuration is valid.
- if (config.isUseSSL())
+ try
{
- try
- {
- createSSLEngineConfigurator(config);
- }
- catch (DirectoryException e)
- {
- logger.traceException(e);
+ createSSLEngineConfigurator(config);
+ }
+ catch (DirectoryException e)
+ {
+ logger.traceException(e);
- unacceptableReasons.add(e.getMessageObject());
- return false;
- }
+ unacceptableReasons.add(e.getMessageObject());
+ return false;
}
}
--
Gitblit v1.10.0