From bb5ca50f747cab0186eae6a14bd8d34be37d56a6 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 23 Sep 2008 12:38:02 +0000
Subject: [PATCH] Fix for issue #3491 (Upgrade from OpenDS 1.0 to revision 4498 fails)
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 0c7e279..71f2519 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -73,9 +73,11 @@
import java.awt.event.WindowEvent;
import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileFilter;
import java.io.FileReader;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
@@ -1519,6 +1521,18 @@
stage.move(root, new UpgradeFileFilter(getStageDirectory(),false));
}
+ // Check if instance.loc exits
+ File instanceFile = new File
+ (installation.getRootDirectory(), "instance.loc");
+ if (! instanceFile.exists())
+ {
+ BufferedWriter instanceLoc =
+ new BufferedWriter(new FileWriter(instanceFile));
+ instanceLoc.append(
+ installation.getInstanceDirectory().getAbsolutePath());
+ instanceLoc.close();
+ }
+
// The bits should now be of the new version. Have
// the installation update the build information so
// that it is correct.
@@ -1891,8 +1905,9 @@
private boolean instanceAndInstallInSameDir()
{
- File installDir = new File(getInstallationPath()) ;
- File instanceDir = new File(getInstancePath()) ;
+ Installation installation = getInstallation() ;
+ File installDir = installation.getRootDirectory();
+ File instanceDir = installation.getInstanceDirectory();
return installDir.getAbsolutePath().equals(instanceDir.getAbsolutePath());
}
--
Gitblit v1.10.0