From 7c8bfd4e360385432ea8d6e0e7ff94f4d80d79dc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Dec 2014 15:34:46 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend

---
 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
index 4da4491..612bbc1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java
@@ -80,7 +80,7 @@
    */
   public void open(WriteableStorage txn) throws StorageRuntimeException
   {
-    storage.openTree(treeName);
+    txn.openTree(treeName);
     if (logger.isTraceEnabled())
     {
       logger.trace("JE database %s opened. txnid=%d", treeName, txn.getId());
@@ -146,7 +146,7 @@
    */
   protected ByteString read(ReadableStorage txn, ByteSequence key, boolean isRMW) throws StorageRuntimeException
   {
-    ByteString value = txn.get(treeName, key);
+    ByteString value = isRMW ? txn.get(treeName, key) : txn.getRMW(treeName, key);
     if (logger.isTraceEnabled())
     {
       logger.trace(messageToLog(value != null, treeName, txn, key, value));

--
Gitblit v1.10.0