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/ui/JavaPropertiesPanel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index dc1f376..e84b802 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -761,11 +761,11 @@
*/
private String getPropertiesFile()
{
- String configDir = Utils.getPath(
- getInfo().getServerDescriptor().getInstallPath().getAbsolutePath(),
- Installation.CONFIG_PATH_RELATIVE);
- String propertiesFile = Utils.getPath(
- configDir, Installation.DEFAULT_JAVA_PROPERTIES_FILE);
+ String installPath = getInfo().getServerDescriptor().
+ getInstallPath().getAbsolutePath();
+ String propertiesFile = Utils.getPath(
+ Utilities.getInstanceRootDirectory(installPath).getAbsolutePath(),
+ Installation.RELATIVE_JAVA_PROPERTIES_FILE);
return propertiesFile;
}
--
Gitblit v1.10.0