From 1a2cdfb5cf5f89348e8fee7ceeaa699d4aa54cea Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Thu, 21 Apr 2016 15:17:15 +0000
Subject: [PATCH] OPENDJ-2616 Support protection of pluggable backend data at rest

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
index ab2b865..9cc954e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexBuffer.java
@@ -47,7 +47,7 @@
 
     void writeTrustState(WriteableTransaction txn) throws StorageRuntimeException;
 
-    void put(Index index, ByteString key, EntryID entryID);
+    void put(DefaultIndex index, ByteString key, EntryID entryID);
 
     void put(VLVIndex index, ByteString sortKey);
 
@@ -223,7 +223,7 @@
     }
 
     @Override
-    public void put(Index index, ByteString key, EntryID entryID)
+    public void put(DefaultIndex index, ByteString key, EntryID entryID)
     {
       createOrGetBufferedIndexValues(index, key).addEntryID(entryID);
     }
@@ -272,20 +272,18 @@
   {
     private final WriteableTransaction txn;
     private final EntryID expectedEntryID;
-    private final ByteString encodedEntryID;
 
     ImportIndexBuffer(WriteableTransaction txn, EntryID expectedEntryID)
     {
       this.txn = txn;
       this.expectedEntryID = expectedEntryID;
-      this.encodedEntryID = ByteString.valueOfLong(expectedEntryID.longValue());
     }
 
     @Override
-    public void put(Index index, ByteString key, EntryID entryID)
+    public void put(DefaultIndex index, ByteString key, EntryID entryID)
     {
       Reject.ifFalse(this.expectedEntryID.equals(entryID), "Unexpected entryID");
-      txn.put(index.getName(), key, encodedEntryID);
+      txn.put(index.getName(), key, index.importToValue(entryID));
     }
 
     @Override
@@ -370,7 +368,7 @@
     impl.writeTrustState(txn);
   }
 
-  void put(Index index, ByteString key, EntryID entryID)
+  void put(DefaultIndex index, ByteString key, EntryID entryID)
   {
     impl.put(index, key, entryID);
   }

--
Gitblit v1.10.0