From 5f8b6b9c154ee7af10e5b3db6228fc3bfe905949 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 06 Jul 2007 23:36:07 +0000
Subject: [PATCH] Revert the changes made in revision 2281 for issue #1865 because they have broken the graphical setup utility. With the changes committed in revision 2281, the setup dialog exits immediately with no error, most likely because of the introduction of a new System.exit calls.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index c420013..0999a2f 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -33,7 +33,6 @@
import org.opends.quicksetup.Launcher;
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.QuickSetupCli;
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.i18n.ResourceProvider;
import org.opends.quicksetup.util.Utils;
@@ -74,16 +73,7 @@
ResourceProvider.getInstance().getMsg("error-initializing-log"));
t.printStackTrace();
}
- Launcher launcher = new UpgradeLauncher(args);
- int returnCode = launcher.launch();
- if (returnCode == QuickSetupCli.VERSION_PRINT)
- {
- System.exit(QuickSetupCli.SUCCESSFUL);
- }
- else
- {
- System.exit(returnCode);
- }
+ new UpgradeLauncher(args).launch();
}
/**
--
Gitblit v1.10.0