From b8d5ff44d76b120e90630e321482bf14721ea54f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 28 Jan 2015 15:18:33 +0000
Subject: [PATCH] Code cleanup: - removed dead code - made code more explicit
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index e3b49b4..debf086 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -732,9 +732,7 @@
// This entire base DN is explicitly included in the import with
// no exclude branches that we need to migrate. Just clear the entry
// container.
- entryContainer.lock();
- entryContainer.clear();
- entryContainer.unlock();
+ clearSuffix(entryContainer);
}
else
{
@@ -745,8 +743,14 @@
}
}
}
- return Suffix.createSuffixContext(entryContainer, sourceEntryContainer,
- includeBranches, excludeBranches);
+ return new Suffix(entryContainer, sourceEntryContainer, includeBranches, excludeBranches);
+ }
+
+ private void clearSuffix(EntryContainer entryContainer)
+ {
+ entryContainer.lock();
+ entryContainer.clear();
+ entryContainer.unlock();
}
private boolean isAnyNotEqualAndAncestorOf(List<DN> dns, DN childDN)
@@ -895,7 +899,7 @@
final long phaseTwoFinishTime = System.currentTimeMillis();
setIndexesTrusted(true);
- switchContainers();
+ switchEntryContainers();
recursiveDelete(tempDir);
final long finishTime = System.currentTimeMillis();
final long importTime = finishTime - startTime;
@@ -963,28 +967,25 @@
dir.delete();
}
- private void switchContainers() throws DatabaseException, JebException,
- InitializationException
+ private void switchEntryContainers() throws DatabaseException, JebException, InitializationException
{
-
for (Suffix suffix : dnSuffixMap.values())
{
DN baseDN = suffix.getBaseDN();
EntryContainer entryContainer = suffix.getSrcEntryContainer();
if (entryContainer != null)
{
- EntryContainer needRegisterContainer =
- rootContainer.unregisterEntryContainer(baseDN);
+ final EntryContainer toDelete = rootContainer.unregisterEntryContainer(baseDN);
+ toDelete.lock();
+ toDelete.close();
+ toDelete.delete();
+ toDelete.unlock();
- needRegisterContainer.lock();
- needRegisterContainer.close();
- needRegisterContainer.delete();
- needRegisterContainer.unlock();
- EntryContainer newEC = suffix.getEntryContainer();
- newEC.lock();
- newEC.setDatabasePrefix(baseDN.toIrreversibleReadableString());
- newEC.unlock();
- rootContainer.registerEntryContainer(baseDN, newEC);
+ final EntryContainer replacement = suffix.getEntryContainer();
+ replacement.lock();
+ replacement.setDatabasePrefix(baseDN.toIrreversibleReadableString());
+ replacement.unlock();
+ rootContainer.registerEntryContainer(baseDN, replacement);
}
}
}
@@ -2908,9 +2909,8 @@
*/
public void initialize() throws ConfigException, InitializationException
{
- entryContainer =
- rootContainer.getEntryContainer(rebuildConfig.getBaseDN());
- suffix = Suffix.createSuffixContext(entryContainer, null, null, null);
+ entryContainer = rootContainer.getEntryContainer(rebuildConfig.getBaseDN());
+ suffix = new Suffix(entryContainer, null, null, null);
if (suffix == null)
{
throw new InitializationException(
--
Gitblit v1.10.0