From 2562f07c27aafc4502661f3d055136206e6fd5ce Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 09 Sep 2009 21:10:10 +0000
Subject: [PATCH] Rejected entries during offline import. Issue 4220.
---
opends/src/server/org/opends/server/util/LDIFReader.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/LDIFReader.java b/opends/src/server/org/opends/server/util/LDIFReader.java
index 8382b89..5ed4441 100644
--- a/opends/src/server/org/opends/server/util/LDIFReader.java
+++ b/opends/src/server/org/opends/server/util/LDIFReader.java
@@ -232,7 +232,8 @@
{
LinkedList<StringBuilder> lines;
DN entryDN;
- EntryID entryID=null;
+ EntryID entryID = null;
+ Suffix suffix = null;
synchronized (this)
{
// Read the set of lines that make up the next entry.
@@ -270,25 +271,24 @@
continue;
}
entryID = rootContainer.getNextEntryID();
- }
- Suffix suffix= Importer.getMatchSuffix(entryDN, map);
- if(suffix == null)
- {
- if (debugEnabled())
+ suffix = Importer.getMatchSuffix(entryDN, map);
+ if(suffix == null)
{
- TRACER.debugInfo("Skipping entry %s because the DN isn't" +
- "one that should be included based on a suffix match" +
- "check." ,entryDN);
+ if (debugEnabled())
+ {
+ TRACER.debugInfo("Skipping entry %s because the DN isn't" +
+ "one that should be included based on a suffix match" +
+ "check." ,entryDN);
+ }
+ entriesRead.incrementAndGet();
+ Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
+ logToSkipWriter(lines, message);
+ entriesIgnored.incrementAndGet();
+ continue;
}
entriesRead.incrementAndGet();
- Message message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
- logToSkipWriter(lines, message);
- entriesIgnored.incrementAndGet();
- continue;
+ suffix.addPending(entryDN);
}
- entriesRead.incrementAndGet();
- suffix.addPending(entryDN);
-
// Read the set of attributes from the entry.
HashMap<ObjectClass,String> objectClasses =
new HashMap<ObjectClass,String>();
--
Gitblit v1.10.0