From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 422e7b7..56cbab2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -130,12 +130,8 @@
rmiConnectorRestart = true;
}
- if (((currentConfig.getSSLCertNickname() != null) &&
- !currentConfig.getSSLCertNickname().equals(
- config.getSSLCertNickname())) ||
- ((config.getSSLCertNickname() != null) &&
- !config.getSSLCertNickname().equals(
- currentConfig.getSSLCertNickname()))) {
+ if (notEqualsNotNull(config.getSSLCertNickname(), currentConfig.getSSLCertNickname())
+ || notEqualsNotNull(config.getSSLCertNickname(), currentConfig.getSSLCertNickname())) {
rmiConnectorRestart = true;
}
@@ -179,6 +175,10 @@
}
+ private boolean notEqualsNotNull(String o1, String o2)
+ {
+ return o1 != null && !o1.equals(o2);
+ }
/** {@inheritDoc} */
@Override
--
Gitblit v1.10.0