From a052caad0008ede711b0c43d9955eccc3bb858ba Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
index f4afb02..ed4a782 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
@@ -50,7 +50,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.JebMessages.*;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.opends.server.admin.std.server.LocalDBBackendCfg;
import static org.opends.server.util.StaticUtils.getFileForPath;
/**
@@ -73,7 +73,7 @@
/**
* The configuration of the JE backend containing the index.
*/
- JEBackendCfg config;
+ LocalDBBackendCfg config;
/**
* The LDIF import configuration, which indicates whether we are
@@ -134,7 +134,7 @@
* @param index The index database to be written.
* @param entryLimit The configured index entry limit.
*/
- IndexMergeThread(JEBackendCfg config,
+ IndexMergeThread(LocalDBBackendCfg config,
LDIFImportConfig ldifImportConfig,
Index index, int entryLimit)
{
@@ -185,7 +185,7 @@
new TreeMap<ASN1OctetString, MergeValue>(comparator);
// Open all the files.
- File tempDir = getFileForPath(config.getBackendImportTempDirectory());
+ File tempDir = getFileForPath(config.getImportTempDirectory());
File[] files = tempDir.listFiles(filter);
if (files == null || files.length == 0)
--
Gitblit v1.10.0