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/backends/pdb/PDBStorage.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
index 296b50d..cf2eb2d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java
@@ -27,6 +27,7 @@
import static com.persistit.Transaction.CommitPolicy.*;
import static java.util.Arrays.*;
+
import static org.opends.messages.BackendMessages.*;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.UtilityMessages.*;
@@ -47,6 +48,7 @@
import java.util.ListIterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Objects;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedDeque;
@@ -509,7 +511,7 @@
ex.fetch();
final ByteSequence oldValue = valueToBytes(ex.getValue());
final ByteSequence newValue = f.computeNewValue(oldValue);
- if (!equals(newValue, oldValue))
+ if (!Objects.equals(newValue, oldValue))
{
if (newValue == null)
{
@@ -530,15 +532,6 @@
}
}
- private boolean equals(ByteSequence b1, ByteSequence b2)
- {
- if (b1 == null)
- {
- return b2 == null;
- }
- return b1.equals(b2);
- }
-
private Exchange getExchangeFromCache(final TreeName treeName) throws PersistitException
{
Exchange exchange = exchanges.get(treeName);
--
Gitblit v1.10.0