From 6637153a58af50420660a656d04ef48eedda2a9c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 26 Jan 2015 09:47:26 +0000
Subject: [PATCH] BackendImpl.java, Importer.java: Removed code duplication regarding whether to clear a backend before an import.
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 9f6ab84..e3b49b4 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
@@ -297,9 +297,7 @@
// Determine the number of indexes.
this.indexCount = getTotalIndexCount(localDBBackendCfg);
- this.clearedBackend =
- !importConfiguration.appendToExistingData()
- && (importConfiguration.clearBackend() || localDBBackendCfg.getBaseDN().size() <= 1);
+ this.clearedBackend = mustClearBackend(importConfiguration, localDBBackendCfg);
this.scratchFileWriterList =
new ArrayList<ScratchFileWriterTask>(indexCount);
this.scratchFileWriterFutures = new CopyOnWriteArrayList<Future<Void>>();
@@ -326,6 +324,19 @@
}
}
+ /**
+ * Returns whether the backend must be cleared.
+ *
+ * @param importCfg the import configuration object
+ * @param backendCfg the backend configuration object
+ * @return true if the backend must be cleared, false otherwise
+ */
+ public static boolean mustClearBackend(LDIFImportConfig importCfg, LocalDBBackendCfg backendCfg)
+ {
+ return !importCfg.appendToExistingData()
+ && (importCfg.clearBackend() || backendCfg.getBaseDN().size() <= 1);
+ }
+
private File getTempDir(LocalDBBackendCfg localDBBackendCfg, String tmpDirectory)
{
File parentDir;
--
Gitblit v1.10.0