From 43b1a81a0dab5dfb3b3ef5d28f3f8c19e91d1d66 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 06 Feb 2014 14:35:04 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java |   32 ++++++--------------------------
 1 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
index db37285..683339b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
@@ -25,6 +25,7 @@
  *      Portions Copyright 2012-2014 ForgeRock AS.
  */
 package org.opends.server.backends.jeb;
+
 import org.forgerock.i18n.LocalizableMessage;
 
 import static org.opends.server.core.DirectoryServer.getMaxInternalBufferSize;
@@ -71,6 +72,7 @@
   private static final ThreadLocal<EntryCodec> ENTRY_CODEC_CACHE =
       new ThreadLocal<EntryCodec>()
   {
+    @Override
     protected EntryCodec initialValue()
     {
       return new EntryCodec();
@@ -112,32 +114,9 @@
 
     private void release()
     {
-      try
-      {
-        writer.close(); // Clears encodedBuffer as well.
-      }
-      catch (Exception ignored)
-      {
-        // Unreachable.
-      }
-
-      if (entryBuffer.capacity() < maxBufferSize)
-      {
-        entryBuffer.clear();
-      }
-      else
-      {
-        entryBuffer.clear(BUFFER_INIT_SIZE);
-      }
-
-      if (compressedEntryBuffer.capacity() < maxBufferSize)
-      {
-        compressedEntryBuffer.clear();
-      }
-      else
-      {
-        compressedEntryBuffer.clear(BUFFER_INIT_SIZE);
-      }
+      closeSilently(writer); // Clears encodedBuffer as well.
+      entryBuffer.clearAndTruncate(maxBufferSize, BUFFER_INIT_SIZE);
+      compressedEntryBuffer.clearAndTruncate(maxBufferSize, BUFFER_INIT_SIZE);
     }
 
     private Entry decode(ByteString bytes, CompressedSchema compressedSchema)
@@ -433,6 +412,7 @@
    * @return true if the entry was written, false if it was not.
    * @throws DatabaseException If an error occurs in the JE database.
    */
+  @Override
   public OperationStatus put(Transaction txn, DatabaseEntry key,
                              DatabaseEntry data)
        throws DatabaseException

--
Gitblit v1.10.0