From be124cd7df8df56616279461f01ef8baea150056 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 15:36:01 +0000
Subject: [PATCH] Use Objects.equals() throughout
---
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 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 c56bcf5..7019709 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
@@ -255,39 +255,21 @@
private boolean anyChangeRequiresRestart(HTTPConnectionHandlerCfg newCfg)
{
return !equals(newCfg.getListenPort(), initConfig.getListenPort())
- || !equals(newCfg.getListenAddress(), initConfig.getListenAddress())
- || !equals(newCfg.getMaxRequestSize(), currentConfig
- .getMaxRequestSize())
- || !equals(newCfg.isAllowTCPReuseAddress(), currentConfig
- .isAllowTCPReuseAddress())
- || !equals(newCfg.isUseTCPKeepAlive(), currentConfig
- .isUseTCPKeepAlive())
+ || !Objects.equals(newCfg.getListenAddress(), initConfig.getListenAddress())
+ || !equals(newCfg.getMaxRequestSize(), currentConfig.getMaxRequestSize())
+ || !equals(newCfg.isAllowTCPReuseAddress(), currentConfig.isAllowTCPReuseAddress())
+ || !equals(newCfg.isUseTCPKeepAlive(), currentConfig.isUseTCPKeepAlive())
|| !equals(newCfg.isUseTCPNoDelay(), currentConfig.isUseTCPNoDelay())
- || !equals(newCfg.getMaxBlockedWriteTimeLimit(), currentConfig
- .getMaxBlockedWriteTimeLimit())
+ || !equals(newCfg.getMaxBlockedWriteTimeLimit(), currentConfig.getMaxBlockedWriteTimeLimit())
|| !equals(newCfg.getBufferSize(), currentConfig.getBufferSize())
|| !equals(newCfg.getAcceptBacklog(), currentConfig.getAcceptBacklog())
|| !equals(newCfg.isUseSSL(), currentConfig.isUseSSL())
- || !equals(newCfg.getKeyManagerProviderDN(), currentConfig
- .getKeyManagerProviderDN())
- || !equals(newCfg.getSSLCertNickname(), currentConfig
- .getSSLCertNickname())
- || !equals(newCfg.getTrustManagerProviderDN(), currentConfig
- .getTrustManagerProviderDN())
- || !equals(newCfg.getSSLProtocol(), currentConfig.getSSLProtocol())
- || !equals(newCfg.getSSLCipherSuite(), currentConfig
- .getSSLCipherSuite())
- || !equals(newCfg.getSSLClientAuthPolicy(), currentConfig
- .getSSLClientAuthPolicy());
- }
-
- private boolean equals(Object o1, Object o2)
- {
- if (o1 == null)
- {
- return o2 == null;
- }
- return o1.equals(o2);
+ || !Objects.equals(newCfg.getKeyManagerProviderDN(), currentConfig.getKeyManagerProviderDN())
+ || !Objects.equals(newCfg.getSSLCertNickname(), currentConfig.getSSLCertNickname())
+ || !Objects.equals(newCfg.getTrustManagerProviderDN(), currentConfig.getTrustManagerProviderDN())
+ || !Objects.equals(newCfg.getSSLProtocol(), currentConfig.getSSLProtocol())
+ || !Objects.equals(newCfg.getSSLCipherSuite(), currentConfig.getSSLCipherSuite())
+ || !Objects.equals(newCfg.getSSLClientAuthPolicy(), currentConfig.getSSLClientAuthPolicy());
}
private boolean equals(long l1, long l2)
--
Gitblit v1.10.0