From 4baece95779dd46a3a59d59d1b7aa5958cf6117d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 05 Nov 2015 12:25:29 +0000
Subject: [PATCH] OPENDJ-1802 Make ByteString methods more intentional
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
index ae5b276..9672c64 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
@@ -1771,7 +1771,7 @@
indexRemoveEntry(indexBuffer, entry, leafID);
// Remove the id2c and id2s records for this entry.
- final ByteString leafIDKeyBytes = ByteString.valueOf(leafID.longValue());
+ final ByteString leafIDKeyBytes = ByteString.valueOfLong(leafID.longValue());
id2children.delete(indexBuffer, leafIDKeyBytes);
id2subtree.delete(indexBuffer, leafIDKeyBytes);
@@ -1787,7 +1787,7 @@
throw new JebException(ERR_MISSING_DN2ID_RECORD.get(parentDN));
}
- ByteString parentIDBytes = ByteString.valueOf(parentID.longValue());
+ ByteString parentIDBytes = ByteString.valueOfLong(parentID.longValue());
// Remove from id2children.
if (isParent)
{
@@ -2286,7 +2286,7 @@
dn = getParentWithinBase(dn))
{
EntryID parentID = dn2id.get(txn, dn, LockMode.DEFAULT);
- ByteString parentIDKeyBytes = ByteString.valueOf(parentID.longValue());
+ ByteString parentIDKeyBytes = ByteString.valueOfLong(parentID.longValue());
if(isParent)
{
id2children.insertID(buffer, parentIDKeyBytes, newID);
@@ -2331,7 +2331,7 @@
for (DN dn = oldSuperiorDN; dn != null; dn = getParentWithinBase(dn))
{
EntryID parentID = dn2id.get(txn, dn, LockMode.DEFAULT);
- ByteString parentIDKeyBytes = ByteString.valueOf(parentID.longValue());
+ ByteString parentIDKeyBytes = ByteString.valueOfLong(parentID.longValue());
if(isParent)
{
id2children.removeID(buffer, parentIDKeyBytes, oldID);
@@ -2345,7 +2345,7 @@
{
// All the subordinates will be renumbered so we have to rebuild
// id2c and id2s with the new ID.
- ByteString oldIDKeyBytes = ByteString.valueOf(oldID.longValue());
+ ByteString oldIDKeyBytes = ByteString.valueOfLong(oldID.longValue());
id2children.delete(buffer, oldIDKeyBytes);
id2subtree.delete(buffer, oldIDKeyBytes);
@@ -2436,7 +2436,7 @@
for (DN dn = oldSuperiorDN; dn != null; dn = getParentWithinBase(dn))
{
EntryID parentID = dn2id.get(txn, dn, LockMode.DEFAULT);
- ByteString parentIDKeyBytes = ByteString.valueOf(parentID.longValue());
+ ByteString parentIDKeyBytes = ByteString.valueOfLong(parentID.longValue());
id2subtree.removeID(buffer, parentIDKeyBytes, oldID);
}
}
@@ -2445,7 +2445,7 @@
{
// All the subordinates will be renumbered so we have to rebuild
// id2c and id2s with the new ID.
- ByteString oldIDKeyBytes = ByteString.valueOf(oldID.longValue());
+ ByteString oldIDKeyBytes = ByteString.valueOfLong(oldID.longValue());
id2children.delete(buffer, oldIDKeyBytes);
id2subtree.delete(buffer, oldIDKeyBytes);
--
Gitblit v1.10.0