From 5ceb2e9601d2501d021d0c61188ec913076555a0 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.
---
opends/src/server/org/opends/server/backends/jeb/VLVIndexMergeThread.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/VLVIndexMergeThread.java b/opends/src/server/org/opends/server/backends/jeb/VLVIndexMergeThread.java
index a6b82ec..13ecd66 100644
--- a/opends/src/server/org/opends/server/backends/jeb/VLVIndexMergeThread.java
+++ b/opends/src/server/org/opends/server/backends/jeb/VLVIndexMergeThread.java
@@ -32,7 +32,7 @@
import static org.opends.server.loggers.debug.DebugLogger.getTracer;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.ErrorLogger.logError;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.types.*;
import org.opends.server.protocols.asn1.ASN1OctetString;
import static org.opends.server.util.StaticUtils.getFileForPath;
@@ -67,7 +67,7 @@
/**
* The configuration of the JE backend containing the vlvIndex.
*/
- JEBackendCfg config;
+ LocalDBBackendCfg config;
/**
* The LDIF import configuration, which indicates whether we are
@@ -121,7 +121,7 @@
* whether we are appending to existing data.
* @param vlvIndex The vlvIndex database to be written.
*/
- VLVIndexMergeThread(JEBackendCfg config,
+ VLVIndexMergeThread(LocalDBBackendCfg config,
LDIFImportConfig ldifImportConfig,
VLVIndex vlvIndex)
{
@@ -170,7 +170,7 @@
public void merge() throws Exception
{
// 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