From 7e1890d56c0e399dcac30435968b5ad8f2032144 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 26 Mar 2009 14:54:05 +0000
Subject: [PATCH] Fix for issue 3582 (Revert fails with "no valid existing backup locations") The problem is that we are using a comparison of absolute paths instead of canonical paths to determine if the server has the same install and instance paths.
---
opends/src/quicksetup/org/opends/quicksetup/Installation.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Installation.java b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
index cbb2607..ee62ea5 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Installation.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -283,7 +283,7 @@
public static final String WINDOWS_STATUSCLI_FILE_NAME = "status.bat";
/**
- * Name of the file kept in the histoy directory containing logs
+ * Name of the file kept in the history directory containing logs
* of upgrade and reversions.
*/
public static final String HISTORY_LOG_FILE_NAME = "log";
@@ -474,14 +474,29 @@
public Installation(File rootDirectory, File instanceDirectory) {
setRootDirectory(rootDirectory);
setInstanceDirectory(instanceDirectory);
- if (rootDirectory.getAbsolutePath().
- equals(instanceDirectory.getAbsolutePath()))
+ try
{
- instanceAndInstallInSameDir = true ;
+ if (rootDirectory.getCanonicalFile().
+ equals(instanceDirectory.getCanonicalFile()))
+ {
+ instanceAndInstallInSameDir = true ;
+ }
+ else
+ {
+ instanceAndInstallInSameDir = false;
+ }
}
- else
+ catch (Throwable t)
{
- instanceAndInstallInSameDir = false;
+ if (rootDirectory.getAbsolutePath().
+ equals(instanceDirectory.getAbsolutePath()))
+ {
+ instanceAndInstallInSameDir = true ;
+ }
+ else
+ {
+ instanceAndInstallInSameDir = false;
+ }
}
}
--
Gitblit v1.10.0