From 34e226e66a617c01d490c8737651bfaac2dc1719 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Fri, 16 Oct 2015 10:06:00 +0000
Subject: [PATCH] OPENDJ-2326: Exclude branch during import-ldif is ignored.

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java
index d764391..18d6348 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ImportLDIFReader.java
@@ -159,6 +159,14 @@
           // read and return the next entry.
           continue;
         }
+        if (!importConfig.includeEntry(entryDN))
+        {
+          logger.trace("Skipping entry %s because the DN is not one that "
+              + "should be included based on the include and exclude branches.", entryDN);
+          entriesRead.incrementAndGet();
+          logToSkipWriter(lines, ERR_LDIF_SKIP.get(entryDN));
+          continue;
+        }
         entryContainer = getEntryContainer(entryDN, suffixesMap);
         if (entryContainer == null)
         {

--
Gitblit v1.10.0