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/util/Utilities.java | 57 ++-------------------------------------------------------
1 files changed, 2 insertions(+), 55 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index fd58eb5..320b5e3 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -38,9 +38,7 @@
import java.awt.Window;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.text.CharacterIterator;
@@ -1536,59 +1534,8 @@
{
if (instanceRootDirectory == null)
{
- String instancePathFileName = installPath + File.separator +
- "instance.loc";
-
- File f = new File(instancePathFileName);
- // look for <installPath>/instance.loc
- if (! f.exists())
- {
- instanceRootDirectory = new File(installPath);
- return instanceRootDirectory;
- }
-
- BufferedReader reader;
- try
- {
- reader = new BufferedReader(new FileReader(instancePathFileName));
- }
- catch (Exception e)
- {
- instanceRootDirectory = new File(installPath);
- return instanceRootDirectory;
- }
-
-
- // Read the first line and close the file.
- String line;
- try
- {
- line = reader.readLine();
- File instanceLoc = new File (line);
- if (instanceLoc.isAbsolute())
- {
- instanceRootDirectory = instanceLoc ;
- return instanceRootDirectory;
- }
- else
- {
- instanceRootDirectory =
- new File(installPath + File.separator + instanceLoc.getPath());
- return instanceRootDirectory;
- }
- }
- catch (Exception e)
- {
- instanceRootDirectory = new File(installPath);
- return instanceRootDirectory;
- }
- finally
- {
- try
- {
- reader.close();
- } catch (Exception e) {}
- }
+ instanceRootDirectory = new File(
+ Utils.getInstancePathFromClasspath(installPath));
}
return instanceRootDirectory;
}
--
Gitblit v1.10.0