From 5c3a5e367d4907d25c23f5a2f1636de54bde9316 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 26 Jan 2015 14:33:44 +0000
Subject: [PATCH] Fixed little issue in r11634.
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 62a6745..f23d200 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,11 +253,11 @@
logger.error(ERR_JEB_IMPORT_LDIF_PENDING_ERR, e.getMessage());
throw e;
}
- //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.
- boolean parentThere = !dnCache.contains(dn)
- && !clearedBackend
- && getDN2ID().get(null, dn, LockMode.DEFAULT) != null;
+ // Either parent is in the DN cache,
+ // or else check the dn2id database for the DN (only if backend wasn't cleared)
+ final boolean parentThere = dnCache.contains(dn)
+ || (!clearedBackend
+ && getDN2ID().get(null, dn, LockMode.DEFAULT) != null);
//Add the DN to the parent set if needed.
if (parentThere) {
synchronized(synchObject) {
--
Gitblit v1.10.0