mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

dugan
26.12.2008 fac789c849c153775d4d7679393c3ce3e9df9588
Partial fix for issue 3083. This fixes the problem with TestImportExport. Still looking at the initializeImport replication tests that are failing.
1 files modified
8 ■■■■ changed files
opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java 8 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/backends/jeb/importLDIF/WorkThread.java
@@ -236,7 +236,9 @@
    if (ldifImportConfig.appendToExistingData() &&
            ldifImportConfig.replaceExistingEntries()) {
      Entry existingEntry = element.getExistingEntry();
      processIndexesEntryDelete(element, existingEntry, entryID, txn);
      if(existingEntry != null) {
          processIndexesEntryDelete(element, existingEntry, entryID, txn);
      }
    }
    Map<AttributeType, AttributeIndex> attrIndexMap =
            context.getAttrIndexMap();
@@ -351,7 +353,9 @@
      if (ldifImportConfig.appendToExistingData() &&
              ldifImportConfig.replaceExistingEntries()) {
        Entry existingEntry = element.getExistingEntry();
        dn2uri.replaceEntry(txn, existingEntry, entry);
        if(existingEntry != null) {
          dn2uri.replaceEntry(txn, existingEntry, entry);
        }
      } else {
        ret= dn2uri.addEntry(txn, entry);
      }