From 70a155bb4f86841566aad9516e6fd6126251c93e Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Thu, 15 Oct 2015 15:15:17 +0000
Subject: [PATCH] Fix: Useless storage re-open after import/rebuild-index.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 1aca1d5..4b467a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -685,15 +685,8 @@
throw new DirectoryException(getServerErrorResultCode(), ERR_REMOVE_FAIL.get(e.getMessage()), e);
}
rootContainer = newRootContainer(AccessMode.READ_WRITE);
- try
- {
- rootContainer.getStorage().close();
- return getImportStrategy(serverContext, rootContainer).importLDIF(importConfig);
- }
- finally
- {
- rootContainer.getStorage().open(AccessMode.READ_WRITE);
- }
+ rootContainer.getStorage().close();
+ return getImportStrategy(serverContext, rootContainer).importLDIF(importConfig);
}
catch (StorageRuntimeException e)
{
@@ -809,16 +802,9 @@
if (openRootContainer)
{
rootContainer = newRootContainer(AccessMode.READ_WRITE);
+ rootContainer.getStorage().close();
}
- rootContainer.getStorage().close();
- try
- {
- getImportStrategy(serverContext, rootContainer).rebuildIndex(rebuildConfig);
- }
- finally
- {
- rootContainer.getStorage().open(AccessMode.READ_WRITE);
- }
+ getImportStrategy(serverContext, rootContainer).rebuildIndex(rebuildConfig);
}
catch (ExecutionException execEx)
{
--
Gitblit v1.10.0