From 6cff6e50e589ff91df76fafac8e0f72918b5ce5c Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Wed, 12 Jul 2006 22:23:35 +0000
Subject: [PATCH] The backends should interpret relative pathnames in the configuration file as relative to the server root rather than the current working directory.
---
opends/src/server/org/opends/server/backends/jeb/ImportJob.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index 5cbd051..5f10cce 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -153,7 +153,7 @@
*/
public void importLDIF() throws DatabaseException, IOException, JebException
{
- String backendDirectory = config.getBackendDirectory();
+ File backendDirectory = config.getBackendDirectory();
EnvironmentConfig envConfig = config.getEnvironmentConfig();
envConfig.setConfigParam("je.env.runCheckpointer", "false");
@@ -176,8 +176,7 @@
envConfig.setConfigParam("je.env.isLocking", "false");
}
- File envHome = new File(backendDirectory);
- env = new Environment(envHome, envConfig);
+ env = new Environment(backendDirectory, envConfig);
if (!ldifImportConfig.appendToExistingData())
{
@@ -185,8 +184,8 @@
// environment and re-open it. Only do this when we are
// importing to all the base DNs in the backend.
env.close();
- EnvManager.removeFiles(backendDirectory);
- env = new Environment(envHome, envConfig);
+ EnvManager.removeFiles(backendDirectory.getPath());
+ env = new Environment(backendDirectory, envConfig);
}
// Divide the total buffer size by the number of threads
--
Gitblit v1.10.0