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/replication/service/ReplicationBroker.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
index 65f6307..10bdeee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
@@ -3116,24 +3116,19 @@
}
final Topology other = (Topology) obj;
return rsServerId == other.rsServerId
- && equals(replicaInfos, other.replicaInfos)
- && equals(rsInfos, other.rsInfos)
+ && Objects.equals(replicaInfos, other.replicaInfos)
+ && Objects.equals(rsInfos, other.rsInfos)
&& urlsEqual1(replicaInfos, other.replicaInfos)
&& urlsEqual2(rsInfos, other.rsInfos);
}
- private boolean equals(Object o1, Object o2)
- {
- return o1 == null ? o2 == null : o1.equals(o2);
- }
-
private boolean urlsEqual1(Map<Integer, DSInfo> replicaInfos1,
Map<Integer, DSInfo> replicaInfos2)
{
for (Entry<Integer, DSInfo> entry : replicaInfos1.entrySet())
{
DSInfo dsInfo = replicaInfos2.get(entry.getKey());
- if (!equals(entry.getValue().getDsUrl(), dsInfo.getDsUrl()))
+ if (!Objects.equals(entry.getValue().getDsUrl(), dsInfo.getDsUrl()))
{
return false;
}
@@ -3147,7 +3142,7 @@
for (Entry<Integer, ReplicationServerInfo> entry : rsInfos1.entrySet())
{
ReplicationServerInfo rsInfo = rsInfos2.get(entry.getKey());
- if (!equals(entry.getValue().getServerURL(), rsInfo.getServerURL()))
+ if (!Objects.equals(entry.getValue().getServerURL(), rsInfo.getServerURL()))
{
return false;
}
--
Gitblit v1.10.0