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/Suffix.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
index a197938..62a6745 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
@@ -253,16 +253,11 @@
logger.error(ERR_JEB_IMPORT_LDIF_PENDING_ERR, e.getMessage());
throw e;
}
- //Check the DN cache.
- boolean parentThere = dnCache.contains(dn);
//If the parent isn't found in the DN cache, then check the dn2id database
//for the DN only if the backend wasn't cleared.
- if(!parentThere
+ boolean parentThere = !dnCache.contains(dn)
&& !clearedBackend
- && getDN2ID().get(null, dn, LockMode.DEFAULT) != null)
- {
- parentThere = true;
- }
+ && getDN2ID().get(null, dn, LockMode.DEFAULT) != null;
//Add the DN to the parent set if needed.
if (parentThere) {
synchronized(synchObject) {
--
Gitblit v1.10.0