From 2a9d8f2329cd7f2210ca0b9eecb0d0d1330142ab 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] OPENDJ-2622 Remove setup temp log file if successful
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 7 +------
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java | 2 +-
2 files changed, 2 insertions(+), 7 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 6d3338d..0b158fe 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
@@ -210,7 +210,7 @@
updateSummaryWithServerState(hmSummary, true);
setCurrentProgressStep(InstallProgressStep.FINISHED_SUCCESSFULLY);
notifyListeners(null);
-
+ tempLogFile.deleteLogFileAfterSuccess();
} catch (ApplicationException ex)
{
logger.error(LocalizableMessage.raw("Caught exception: "+ex, ex));
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
index 315751c..54a0aef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -285,12 +285,7 @@
final PrintStream err = NullOutputStream.wrapOrNullStream(errStream);
final InstallDS install = new InstallDS(out, err, inStream, tempLogFile);
- int retCode = install.execute(args);
- if (retCode == 0)
- {
- tempLogFile.deleteLogFileAfterSuccess();
- }
- return retCode;
+ return install.execute(args);
}
/**
--
Gitblit v1.10.0