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/OnDiskMergeImporter.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index 2d08f3d..5dca49c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -733,8 +733,8 @@
Executors.newSingleThreadScheduledExecutor(newThreadFactory(null, PHASE1_REPORTER_THREAD_NAME, true));
scheduler.scheduleAtFixedRate(new PhaseOneProgressReporter(), 10, 10, TimeUnit.SECONDS);
final PromiseImpl<Void, Exception> promise = PromiseImpl.create();
- try (final SequentialCursor<ByteString, ByteString> cursor =
- importer.openCursor(entryContainer.getID2Entry().getName()))
+ final ID2Entry id2Entry = entryContainer.getID2Entry();
+ try (final SequentialCursor<ByteString, ByteString> cursor = importer.openCursor(id2Entry.getName()))
{
while (cursor.next())
{
@@ -748,7 +748,7 @@
try
{
entryProcessor.processEntry(entryContainer,
- new EntryID(key), ID2Entry.entryFromDatabase(value, schema));
+ new EntryID(key), id2Entry.entryFromDatabase(value, schema));
nbEntriesProcessed.incrementAndGet();
}
catch (Exception e)
@@ -3190,7 +3190,7 @@
{
if (resultContainer.size() < indexLimit)
{
- resultContainer.add(value.toLong());
+ resultContainer.add(index.importDecodeValue(value));
}
/*
* else EntryIDSet is above index entry limits, discard additional values
--
Gitblit v1.10.0