From 43ba6d721185f9a810761720fcb05103b31d17b7 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Wed, 29 Oct 2008 10:39:44 +0000
Subject: [PATCH] Fix 3534: Provide native Solaris packages (fix also 3533: upgrade fails starting server adding entry ds-cfg-key-id)
---
opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
index f7be01a..db299c8 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
@@ -77,15 +77,17 @@
backendSet = new HashSet<String>();
CommonSchemaElements element = getSchemaElement();
schemaFile = element.getSchemaFile();
+ boolean userSchema = false ;
if (schemaFile == null)
{
schemaFile = ConfigConstants.FILE_USER_SCHEMA_ELEMENTS;
+ userSchema = true;
}
File f = new File(schemaFile);
if (!f.isAbsolute())
{
f = new File(
- DirectoryServer.getEnvironmentConfig().getSchemaDirectory(),
+ DirectoryServer.getEnvironmentConfig().getSchemaDirectory(userSchema),
schemaFile);
}
schemaFile = f.getAbsolutePath();
--
Gitblit v1.10.0