From 5689a8d3e584ebfaffe5e618769cdde894c24931 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 23 Jan 2015 12:31:49 +0000
Subject: [PATCH] ImportIDSet.java: Code simplification
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java
index d333fcd..2186294 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/ImportIDSet.java
@@ -109,7 +109,7 @@
*
* @param entryID The entry ID to add to an import ID set.
*/
- public void addEntryID(EntryID entryID) {
+ void addEntryID(EntryID entryID) {
addEntryID(entryID.longValue());
}
@@ -118,7 +118,7 @@
*
* @param l The long value to add to an import ID set.
*/
- public void addEntryID(long l) {
+ void addEntryID(long l) {
if(!isDefined()) {
if(doCount) {
undefinedSize++;
@@ -431,28 +431,29 @@
public byte[] toDatabase()
{
if(isDefined) {
- return encode(null);
+ return encode();
} else {
return JebFormat.entryIDUndefinedSizeToDatabase(undefinedSize);
}
}
- private byte[] encode(byte[] bytes)
+ private byte[] encode()
{
- int encodedSize = count * 8;
- if (bytes == null || bytes.length < encodedSize) {
- bytes = new byte[encodedSize];
- }
- for (int pos = 0, i = 0; i < count; i++) {
- long v = array[i] & 0x00ffffffffL;
- bytes[pos++] = (byte) ((v >>> 56) & 0xFF);
- bytes[pos++] = (byte) ((v >>> 48) & 0xFF);
- bytes[pos++] = (byte) ((v >>> 40) & 0xFF);
- bytes[pos++] = (byte) ((v >>> 32) & 0xFF);
- bytes[pos++] = (byte) ((v >>> 24) & 0xFF);
- bytes[pos++] = (byte) ((v >>> 16) & 0xFF);
- bytes[pos++] = (byte) ((v >>> 8) & 0xFF);
- bytes[pos++] = (byte) (v & 0xFF);
+ final int encodedSize = count * 8;
+ final byte[] bytes = new byte[encodedSize];
+ int pos = 0;
+ for (int i = 0; i < count; i++) {
+ final long id = array[i] & 0x00ffffffffL; // JNR: why is this necessary?
+
+ // encode the entryID
+ bytes[pos++] = (byte) ((id >>> 56) & 0xFF);
+ bytes[pos++] = (byte) ((id >>> 48) & 0xFF);
+ bytes[pos++] = (byte) ((id >>> 40) & 0xFF);
+ bytes[pos++] = (byte) ((id >>> 32) & 0xFF);
+ bytes[pos++] = (byte) ((id >>> 24) & 0xFF);
+ bytes[pos++] = (byte) ((id >>> 16) & 0xFF);
+ bytes[pos++] = (byte) ((id >>> 8) & 0xFF);
+ bytes[pos++] = (byte) (id & 0xFF);
}
return bytes;
}
--
Gitblit v1.10.0