From c55ad7c550a887b411d5ddc57ce6bd89822b02e2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 17:21:56 +0000
Subject: [PATCH] Improved importLDIF code.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
index b1eb8f8..376e990 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryContainer.java
@@ -3163,33 +3163,20 @@
/**
* Clear the contents for a database from disk.
*
+ * @param txn The database transaction
* @param database The database to clear.
* @throws StorageRuntimeException if a JE database error occurs.
*/
- public void clearDatabase(final DatabaseContainer database) throws StorageRuntimeException
+ public void clearDatabase(WriteableStorage txn, DatabaseContainer database) throws StorageRuntimeException
{
database.close();
try
{
- storage.write(new WriteOperation()
- {
- @Override
- public void run(WriteableStorage txn) throws Exception
- {
- try
- {
- txn.deleteTree(database.getName());
- }
- finally
- {
- database.open(txn);
- }
- }
- });
+ txn.deleteTree(database.getName());
}
- catch (Exception e)
+ finally
{
- throw new StorageRuntimeException(e);
+ database.open(txn);
}
if(logger.isTraceEnabled())
{
--
Gitblit v1.10.0