From 77131174b396433451592ca82362a3534ce74c80 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 16 Dec 2014 14:49:33 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/DatabaseContainer.java | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 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 f9832b6..4da4491 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
@@ -78,34 +78,12 @@
* @throws StorageRuntimeException if a JE database error occurs while
* opening the index.
*/
- public void open() throws StorageRuntimeException
+ public void open(WriteableStorage txn) throws StorageRuntimeException
{
- if (dbConfig.getTransactional())
+ storage.openTree(treeName);
+ if (logger.isTraceEnabled())
{
- // Open the database under a transaction.
- Transaction txn = entryContainer.beginTransaction();
- try
- {
- treeName = storage.openDatabase(txn, treeName, dbConfig);
- if (logger.isTraceEnabled())
- {
- logger.trace("JE database %s opened. txnid=%d", treeName, txn.getId());
- }
- EntryContainer.transactionCommit(txn);
- }
- catch (StorageRuntimeException e)
- {
- EntryContainer.transactionAbort(txn);
- throw e;
- }
- }
- else
- {
- treeName = storage.openDatabase(null, treeName, dbConfig);
- if (logger.isTraceEnabled())
- {
- logger.trace("JE database %s opened. txnid=none", treeName);
- }
+ logger.trace("JE database %s opened. txnid=%d", treeName, txn.getId());
}
}
@@ -131,7 +109,6 @@
{
treeName.sync();
}
- storage.openTree(treeName)
treeName.close();
treeName = null;
--
Gitblit v1.10.0