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/DeleteSchemaElementsTask.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
index 9cbeabe..90d147a 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -371,8 +371,14 @@
if (!f.isAbsolute())
{
f = new File(
- DirectoryServer.getEnvironmentConfig().getSchemaDirectory(),
+ DirectoryServer.getEnvironmentConfig().getSchemaDirectory(false),
schemaFile);
+ if (f == null || ! f.exists() || f.isDirectory())
+ {
+ f = new File(
+ DirectoryServer.getEnvironmentConfig().getSchemaDirectory(true),
+ schemaFile);
+ }
}
schemaFile = f.getAbsolutePath();
return schemaFile;
--
Gitblit v1.10.0