Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/server/org/opends/server/backends/jeb/ImportThread.java

@@ -180,7 +180,7 @@
    for (AttributeIndex attrIndex : entryContainer.getAttributeIndexes())
    {
      int indexEntryLimit =
          importContext.getConfig().getBackendIndexEntryLimit();
          importContext.getConfig().getIndexEntryLimit();
      if(attrIndex.getConfiguration().getIndexEntryLimit() != null)
      {
        indexEntryLimit = attrIndex.getConfiguration().getIndexEntryLimit();
@@ -243,7 +243,7 @@
    Index id2Children = entryContainer.getID2Children();
    AttributeIndexBuilder attributeIndexBuilder =
         new AttributeIndexBuilder(importContext, id2Children,
                          importContext.getConfig().getBackendIndexEntryLimit(),
                          importContext.getConfig().getIndexEntryLimit(),
                          indexBufferSize);
    builders.add(attributeIndexBuilder);

@@ -251,7 +251,7 @@
    Index id2Subtree = entryContainer.getID2Subtree();
    attributeIndexBuilder =
         new AttributeIndexBuilder(importContext, id2Subtree,
                          importContext.getConfig().getBackendIndexEntryLimit(),
                          importContext.getConfig().getIndexEntryLimit(),
                          indexBufferSize);
    builders.add(attributeIndexBuilder);