From 804e7bcf05391ecdc76f02c0647446e4765e97a6 Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Sat, 25 Aug 2007 18:09:20 +0000
Subject: [PATCH] Issue 466 preparation.
---
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 54c70c3..1869bc6 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -163,7 +163,6 @@
notifyListeners(getTaskSeparator());
setCurrentProgressStep(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
enableWindowsService();
-
checkAbort();
}
@@ -172,17 +171,6 @@
notifyListeners(getTaskSeparator());
setCurrentProgressStep(InstallProgressStep.STARTING_SERVER);
new ServerController(this).startServer();
-
- checkAbort();
- }
-
- if (mustConfigureReplication())
- {
- setCurrentProgressStep(InstallProgressStep.CONFIGURING_REPLICATION);
- notifyListeners(getTaskSeparator());
-
- configureReplication();
-
checkAbort();
}
@@ -191,7 +179,14 @@
notifyListeners(getTaskSeparator());
setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
updateADS();
+ checkAbort();
+ }
+ if (mustConfigureReplication())
+ {
+ notifyListeners(getTaskSeparator());
+ setCurrentProgressStep(InstallProgressStep.CONFIGURING_REPLICATION);
+ configureReplication();
checkAbort();
}
@@ -201,7 +196,6 @@
setCurrentProgressStep(
InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
initializeSuffixes();
-
checkAbort();
}
--
Gitblit v1.10.0