From 7b11fcf138a9310aa14d26fea3249d6073c38828 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 11 Apr 2016 17:22:17 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
index b935d5f..6d3338d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.quicksetup.installer.offline;
@@ -37,8 +37,8 @@
import org.opends.quicksetup.ProgressStep;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.SecurityOptions;
-import org.opends.quicksetup.installer.Installer;
import org.opends.quicksetup.installer.InstallProgressStep;
+import org.opends.quicksetup.installer.Installer;
import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.FileManager;
@@ -89,7 +89,7 @@
setCurrentProgressStep(InstallProgressStep.CONFIGURING_SERVER);
- notifyListenersOfLog();
+ notifyListenersOfLog(false);
notifyListeners(getLineBreak());
configureServer();
@@ -244,7 +244,7 @@
notifyListeners(html);
logger.error(LocalizableMessage.raw("Error installing.", ex));
notifyListeners(getLineBreak());
- notifyListenersOfLogAfterError();
+ notifyListenersOfLog(true);
}
runError = ex;
}
@@ -278,7 +278,7 @@
notifyListeners(msg);
logger.error(LocalizableMessage.raw("Error installing.", t));
notifyListeners(getLineBreak());
- notifyListenersOfLogAfterError();
+ notifyListenersOfLog(true);
runError = ex;
}
finally
@@ -545,4 +545,14 @@
return Utils.getInstancePathFromInstallPath(installPath);
}
+ private void notifyListenersOfLog(final boolean isError)
+ {
+ if (tempLogFile.isEnabled())
+ {
+ final String tempLogFilePath = tempLogFile.getPath();
+ notifyListeners(getFormattedProgress(isError ? INFO_GENERAL_PROVIDE_LOG_IN_ERROR.get(tempLogFilePath)
+ : INFO_GENERAL_SEE_FOR_DETAILS.get(tempLogFilePath)));
+ notifyListeners(getLineBreak());
+ }
+ }
}
--
Gitblit v1.10.0