From e8053208c37ad81d6778f723a70f598d296437a0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Dec 2014 11:29:13 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java | 47 +++++++++++++----------------------------------
1 files changed, 13 insertions(+), 34 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
index 7e39a52..f2bd4d0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/DatabaseContainer.java
@@ -42,30 +42,16 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- /**
- * The database entryContainer.
- */
- protected EntryContainer entryContainer;
-
- /**
- * The JE database configuration.
- */
- protected DatabaseConfig dbConfig;
-
- /**
- * The name of the database within the entryContainer.
- */
+ /** The database entryContainer. */
+ protected final EntryContainer entryContainer;
+ /** The name of the database within the entryContainer. */
protected String name;
- /**
- * The reference to the JE Environment.
- */
- private Environment env;
-
- /**
- * A JE database handle opened through this database
- * container.
- */
+ /** The JE database configuration. */
+ protected DatabaseConfig dbConfig;
+ /** The reference to the JE Environment. */
+ private final Environment env;
+ /** A JE database handle opened through this database container. */
private Database database;
/**
@@ -74,11 +60,8 @@
* @param name The name of the entry database.
* @param env The JE Environment.
* @param entryContainer The entryContainer of the entry database.
- * @throws DatabaseException if a JE database error occurs.
*/
- protected DatabaseContainer(String name, Environment env,
- EntryContainer entryContainer)
- throws DatabaseException
+ protected DatabaseContainer(String name, Environment env, EntryContainer entryContainer)
{
this.env = env;
this.entryContainer = entryContainer;
@@ -98,16 +81,13 @@
if (dbConfig.getTransactional())
{
// Open the database under a transaction.
- Transaction txn =
- entryContainer.beginTransaction();
+ Transaction txn = entryContainer.beginTransaction();
try
{
database = env.openDatabase(txn, name, dbConfig);
if (logger.isTraceEnabled())
{
- logger.trace("JE database %s opened. txnid=%d",
- database.getDatabaseName(),
- txn.getId());
+ logger.trace("JE database %s opened. txnid=%d", database.getDatabaseName(), txn.getId());
}
EntryContainer.transactionCommit(txn);
}
@@ -122,8 +102,7 @@
database = env.openDatabase(null, name, dbConfig);
if (logger.isTraceEnabled())
{
- logger.trace("JE database %s opened. txnid=none",
- database.getDatabaseName());
+ logger.trace("JE database %s opened. txnid=none", database.getDatabaseName());
}
}
}
@@ -144,7 +123,7 @@
* @throws DatabaseException if an error occurs.
*/
@Override
- synchronized public void close() throws DatabaseException
+ public synchronized void close() throws DatabaseException
{
if(dbConfig.getDeferredWrite())
{
--
Gitblit v1.10.0