From 7b882d3300019e3fa8d850bbd44ffc3aac68dc2d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 19 Jul 2007 20:16:22 +0000
Subject: [PATCH] Use consistently the terminology "Base DN" instead of suffix in the graphical tools.
---
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index af599fe..35b7b81 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -209,6 +209,7 @@
}
checkAbort();
+ updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_SUCCESSFULLY);
notifyListeners(null);
@@ -219,8 +220,18 @@
setCurrentProgressStep(InstallProgressStep.FINISHED_CANCELED);
notifyListeners(null);
} else {
+ // Stop the server if necessary
+ Installation installation = getInstallation();
+ if (installation.getStatus().isServerRunning()) {
+ try {
+ new ServerController(installation).stopServer(true);
+ } catch (Throwable t) {
+ LOG.log(Level.INFO, "error stopping server", t);
+ }
+ }
notifyListeners(getLineBreak());
notifyListenersOfLog();
+ updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
String html = getFormattedError(ex, true);
notifyListeners(html);
@@ -229,8 +240,18 @@
}
catch (Throwable t)
{
+ // Stop the server if necessary
+ Installation installation = getInstallation();
+ if (installation.getStatus().isServerRunning()) {
+ try {
+ new ServerController(installation).stopServer(true);
+ } catch (Throwable t2) {
+ LOG.log(Level.INFO, "error stopping server", t2);
+ }
+ }
notifyListeners(getLineBreak());
notifyListenersOfLog();
+ updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
ApplicationException ex = new ApplicationException(
ApplicationException.Type.BUG, getThrowableMsg("bug-msg", t), t);
--
Gitblit v1.10.0