From 87c7d8eee45762a26567f98ebe3338602b567b74 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Mar 2014 14:11:35 +0000
Subject: [PATCH] OPENDJ-1308 (CR-3156) Migrate schema support - ByteString - Indexer

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
index c9d8a2a..312e056 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
@@ -86,7 +86,8 @@
    */
   public EntryIDSet(byte[] keyBytes, byte[] bytes)
   {
-    this(keyBytes != null ? ByteString.wrap(keyBytes) : null, bytes);
+    this(keyBytes != null ? ByteString.wrap(keyBytes) : null,
+        bytes != null ? ByteString.wrap(bytes) : null);
   }
 
   /**
@@ -97,7 +98,7 @@
    * @param bytes
    *          The database value, or null if there are no entry IDs.
    */
-  public EntryIDSet(ByteString keyBytes, byte[] bytes)
+  public EntryIDSet(ByteString keyBytes, ByteString bytes)
   {
     this.keyBytes = keyBytes;
 
@@ -107,23 +108,23 @@
       return;
     }
 
-    if (bytes.length == 0)
+    if (bytes.length() == 0)
     {
       // Entry limit has exceeded and there is no encoded undefined set size.
       values = null;
       undefinedSize = Long.MAX_VALUE;
     }
-    else if ((bytes[0] & 0x80) == 0x80)
+    else if ((bytes.byteAt(0) & 0x80) == 0x80)
     {
       // Entry limit has exceeded and there is an encoded undefined set size.
       values = null;
-      undefinedSize = JebFormat.entryIDUndefinedSizeFromDatabase(bytes);
+      undefinedSize = bytes.toLong();
     }
     else
     {
       // Seems like entry limit has not been exceeded and the bytes is a
       // list of entry IDs.
-      values = JebFormat.entryIDListFromDatabase(bytes);
+      values = JebFormat.entryIDListFromDatabase(bytes.toByteArray());
     }
 
   }

--
Gitblit v1.10.0