From e0282ec33fe1e11be327f48281306335aee50014 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 13 Oct 2009 00:20:25 +0000
Subject: [PATCH] Fix for issue 4274 (ZIP package control-panel displays both installation path and instance path)
---
opends/src/server/org/opends/server/extensions/ConfigFileHandler.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
index 2a200a3..90ea0ab 100644
--- a/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
+++ b/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -735,7 +735,19 @@
}
else
{
- serverRoot = rootFile.getAbsolutePath();
+ /*
+ * Do a best effort to avoid having a relative representation (for
+ * instance to avoid having ../../../).
+ */
+ try
+ {
+ serverRoot = rootFile.getCanonicalPath();
+ }
+ catch (IOException ioe)
+ {
+ // Best effort
+ serverRoot = rootFile.getAbsolutePath();
+ }
}
// Determine the appropriate server root. If it's not defined in the
--
Gitblit v1.10.0