From 8ecaf08352a6258b39b3b6632fd3b63d85f631a3 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 29 Apr 2009 09:07:39 +0000
Subject: [PATCH] fix click-thru license for the upgrade between 1.x and 2.0
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 9464040..98b060d 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -821,7 +821,14 @@
// Check license
if (!LicenseFile.isAlreadyApproved())
{
+ // Opends 1.2 upgrade: INSTALL_ROOT is set as a java CLI property.
String installRootFromSystem = System.getProperty("INSTALL_ROOT");
+
+ if (installRootFromSystem == null)
+ {
+ // Opends 1.0 upgrade: INSTALL_ROOT is not set.
+ installRootFromSystem = System.getenv("INSTANCE_ROOT");
+ }
System.setProperty("INSTALL_ROOT", installRootFromSystem
+ File.separator + "tmp" + File.separator + "upgrade");
if (LicenseFile.exists())
--
Gitblit v1.10.0