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/guitools/controlpanel/datamodel/BinaryValue.java | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
index 64835be..95d9818 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
@@ -29,6 +29,7 @@
import java.io.File;
import java.text.ParseException;
+import java.util.Objects;
import org.opends.server.util.Base64;
@@ -178,21 +179,12 @@
{
BinaryValue candidate = (BinaryValue)o;
return candidate.getType() == getType()
- && equal(file, candidate.getFile())
+ && Objects.equals(file, candidate.getFile())
&& bytesEqual(candidate);
}
return false;
}
- private boolean equal(File o1, File o2)
- {
- if (o1 == null)
- {
- return o2 == null;
- }
- return o1.equals(o2);
- }
-
private boolean bytesEqual(BinaryValue candidate)
{
if (type == Type.BASE64_STRING)
--
Gitblit v1.10.0