Fix missing dn2uri support and additional message logging

dugan

08.21.2009 13c2639e88456dc83b54d2956d7441511f0cf80a

Fix missing dn2uri support and additional message logging

 opendj-sdk/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);
      }
    }
  }



 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java

@@ -36,6 +36,10 @@
import org.opends.server.backends.jeb.*;
import org.opends.server.config.ConfigException;
import org.opends.server.types.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import org.opends.messages.Message;
import org.opends.messages.Category;
import org.opends.messages.Severity;
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.LockMode;

@@ -230,10 +234,18 @@
      try {
        Thread.sleep(50);
        if(i == 10) {
          //Temporary message until this code is removed.
           Message message = Message.raw(Category.JEB, Severity.SEVERE_ERROR,
               "time out in parentID check");
          logError(message);
          return null;
        }
        i++;
      } catch (Exception e) {
        //Temporary message until this code is removed.
         Message message = Message.raw(Category.JEB, Severity.SEVERE_ERROR,
                "Exception thrown in parentID check");
         logError(message);
        return null;
      }
    }