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/ExportJob.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
index 680a97e..aedf099 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
@@ -171,8 +171,8 @@
   private void exportContainer(ReadableTransaction txn, EntryContainer entryContainer)
        throws StorageRuntimeException, IOException, LDIFException
   {
-    Cursor<ByteString, ByteString> cursor = txn.openCursor(entryContainer.getID2Entry().getName());
-    try
+    ID2Entry id2entry = entryContainer.getID2Entry();
+    try (final Cursor<ByteString, ByteString> cursor = txn.openCursor(id2entry.getName()))
     {
       while (cursor.next())
       {
@@ -209,8 +209,7 @@
         Entry entry = null;
         try
         {
-          entry = ID2Entry.entryFromDatabase(value,
-                       entryContainer.getRootContainer().getCompressedSchema());
+          entry = id2entry.entryFromDatabase(value, entryContainer.getRootContainer().getCompressedSchema());
         }
         catch (Exception e)
         {
@@ -235,10 +234,6 @@
         }
       }
     }
-    finally
-    {
-      cursor.close();
-    }
   }
 
   /** This class reports progress of the export job at fixed intervals. */

--
Gitblit v1.10.0