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/tools/dsreplication/ReplicationCliMain.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 03ac76e..b809334 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -46,6 +46,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -8018,7 +8019,7 @@
{
for (ServerProperty prop : propertiesToCompare)
{
- if (!equals(server1.get(prop), server2.get(prop)))
+ if (!Objects.equals(server1.get(prop), server2.get(prop)))
{
return false;
}
@@ -8026,15 +8027,6 @@
return true;
}
- private boolean equals(Object o1, Object o2)
- {
- if (o1 != null)
- {
- return o1.equals(o2);
- }
- return o2 == null;
- }
-
/**
* Tells whether we are trying to disable all the replicated suffixes.
* @param uData the disable replication data provided by the user.
--
Gitblit v1.10.0