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/BackendImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index cb77aa2..8184f46 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -729,10 +729,7 @@
try
{
- final EnvironmentConfig envConfig = getEnvConfigForImport();
-
- if (!importConfig.appendToExistingData()
- && (importConfig.clearBackend() || cfg.getBaseDN().size() <= 1))
+ if (Importer.mustClearBackend(importConfig, cfg))
{
// We have the writer lock on the environment, now delete the
// environment and re-open it. Only do this when we are
@@ -747,7 +744,8 @@
}
}
- Importer importer = new Importer(importConfig, cfg, envConfig);
+ final EnvironmentConfig envConfig = getEnvConfigForImport();
+ final Importer importer = new Importer(importConfig, cfg, envConfig);
rootContainer = initializeRootContainer(envConfig);
return importer.processImport(rootContainer);
}
--
Gitblit v1.10.0