From d6cf099f76e1905e804e51884725e56a00f46cdf Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Tue, 08 Sep 2009 02:21:34 +0000
Subject: [PATCH] Fix missing dn2uri support and additional message logging
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 044d35d..db204b7 100644
--- a/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -947,6 +947,7 @@
suffix.removePending(entryDN);
entryID = oldID;
}
+ processDN2URI(suffix, oldEntry, entry);
suffix.getID2Entry().put(null, entryID, entry);
if(oldEntry == null)
{
@@ -1139,6 +1140,7 @@
processDN2ID(suffix, entryDN, entryID);
suffix.removePending(entryDN);
}
+ processDN2URI(suffix, null, entry);
suffix.getID2Entry().put(null, entryID, entry);
processIndexes(suffix, entry, entryID);
}
@@ -1233,10 +1235,20 @@
try {
Thread.sleep(50);
if(i == 10) {
+ //Temporary messages until this code is cleaned up.
+ Message message =
+ Message.raw(Category.JEB, Severity.SEVERE_ERROR,
+ "ancestorID check failed");
+ logError(message);
return null;
}
i++;
} catch (Exception e) {
+ //Temporary messages until this code is cleaned up.
+ Message message =
+ Message.raw(Category.JEB, Severity.SEVERE_ERROR,
+ "ancestorID exception thrown");
+ logError(message);
return null;
}
}
@@ -1400,6 +1412,20 @@
new IndexKey(dnType, IndexType.DN), true);
idECMap.putIfAbsent(id, suffix.getEntryContainer());
}
+
+ void processDN2URI(Suffix suffix, Entry oldEntry, Entry newEntry)
+ throws DatabaseException
+ {
+ DN2URI dn2uri = suffix.getDN2URI();
+ if(oldEntry != null)
+ {
+ dn2uri.replaceEntry(null, oldEntry, newEntry);
+ }
+ else
+ {
+ dn2uri.addEntry(null, newEntry);
+ }
+ }
}
--
Gitblit v1.10.0