From be9f94f921957835e36578e31b5905a91de24cd3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 18 Dec 2014 17:04:27 +0000
Subject: [PATCH] OPENDJ-1602 New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
index 5c4c648..ef0dfee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
@@ -988,7 +988,7 @@
// default ordering. VLV search request goes through as if
// this sort key was not found in the user entry.
entryIDList =
- EntryIDSetSorter.sort(EntryContainer.this, entryIDList, searchOperation,
+ EntryIDSetSorter.sort(EntryContainer.this, txn, entryIDList, searchOperation,
sortRequest.getSortOrder(), vlvRequest);
if (sortRequest.containsSortKeys())
{
@@ -1236,7 +1236,7 @@
if (isInScope)
{
// Process the candidate entry.
- final Entry entry = getEntry(entryID);
+ final Entry entry = getEntry(txn, entryID);
if (entry != null)
{
lookthroughCount++;
@@ -1299,7 +1299,7 @@
* @throws DirectoryException
* If an error occurs retrieving the entry
*/
- public Entry getEntry(EntryID entryID) throws DirectoryException
+ public Entry getEntry(ReadableStorage txn, EntryID entryID) throws DirectoryException
{
// Try the entry cache first.
final EntryCache entryCache = getEntryCache();
@@ -1309,7 +1309,7 @@
return cacheEntry;
}
- final Entry entry = id2entry.get(null, entryID, false);
+ final Entry entry = id2entry.get(txn, entryID, false);
if (entry != null)
{
// Put the entry in the cache making sure not to overwrite a newer copy
@@ -1391,7 +1391,7 @@
Entry entry;
try
{
- entry = getEntry(id);
+ entry = getEntry(txn, id);
}
catch (Exception e)
{
--
Gitblit v1.10.0