From 46f64d6b7b18945b4d609fabe9ac87b3f6cb8f30 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 16 Aug 2007 20:56:31 +0000
Subject: [PATCH] This commit gets the QuickSetup installer working again by specifying the server root during the directory configuration. This is addressed by adding a hidden arg to ConfigureDS for the server root that the installer uses for the specification of the directory.
---
opends/src/server/org/opends/server/core/SchemaConfigManager.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SchemaConfigManager.java b/opends/src/server/org/opends/server/core/SchemaConfigManager.java
index f94317b..fcdd15d 100644
--- a/opends/src/server/org/opends/server/core/SchemaConfigManager.java
+++ b/opends/src/server/org/opends/server/core/SchemaConfigManager.java
@@ -117,7 +117,11 @@
{
File schemaDir =
DirectoryServer.getEnvironmentConfig().getSchemaDirectory();
- return schemaDir.getAbsolutePath();
+ if (schemaDir != null) {
+ return schemaDir.getAbsolutePath();
+ } else {
+ return null;
+ }
}
@@ -212,7 +216,7 @@
try
{
- if (! schemaDir.exists())
+ if (schemaDirPath == null || ! schemaDir.exists())
{
Message message = ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR.get(schemaDirPath);
throw new InitializationException(message);
--
Gitblit v1.10.0