From 1ad16ad47d3a692e66c4b98e302d96dbcbd0d10e Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 14 Oct 2009 16:35:16 +0000
Subject: [PATCH] Fix for thread time out problem.Issue 4280
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 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 34caa69..56cd6c2 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
@@ -1333,7 +1333,7 @@
EntryContainer entryContainer = suffix.getEntryContainer();
for (DN dn = entryContainer.getParentWithinBase(parentDN); dn != null;
dn = entryContainer.getParentWithinBase(dn)) {
- if((nodeID = getAncestorID(dn2id, dn)) == null) {
+ if((nodeID = suffix.getParentID(dn)) == null) {
return false;
} else {
IDs.add(nodeID);
@@ -1372,38 +1372,6 @@
id2subtree.insert(idSubSet, subTreeKeySet, dbSubKey, dbSubVal);
}
- EntryID getAncestorID(DN2ID dn2id, DN dn)
- throws DatabaseException
- {
- int i=0;
- EntryID nodeID = dn2id.get(null, dn, LockMode.DEFAULT);
- if(nodeID == null) {
- while((nodeID = dn2id.get(null, dn, LockMode.DEFAULT)) == null) {
- 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;
- }
- }
- }
- return nodeID;
- }
-
-
void
processIndexes(Suffix suffix, Entry entry, EntryID entryID) throws
--
Gitblit v1.10.0