From 62e7d6b484fd311c6dbc79b5d58e62eb5c845386 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 14 Mar 2008 18:18:47 +0000
Subject: [PATCH] Fix for issue 3060 (setup should refer to the setup's log *after* the error message) Show the information about the log file after the error message is displayed.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java | 6 ++++--
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
index 3815871..cf7622a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -243,12 +243,13 @@
}
}
notifyListeners(getLineBreak());
- notifyListenersOfLog();
updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
Message html = getFormattedError(ex, true);
notifyListeners(html);
LOG.log(Level.SEVERE, "Error installing.", ex);
+ notifyListeners(getLineBreak());
+ notifyListenersOfLog();
}
runError = ex;
}
@@ -273,7 +274,6 @@
}
}
notifyListeners(getLineBreak());
- notifyListenersOfLog();
updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
ApplicationException ex = new ApplicationException(
@@ -282,6 +282,8 @@
Message msg = getFormattedError(ex, true);
notifyListeners(msg);
LOG.log(Level.SEVERE, "Error installing.", t);
+ notifyListeners(getLineBreak());
+ notifyListenersOfLog();
runError = ex;
}
finally
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index 776ef75..0971a89 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -293,12 +293,13 @@
}
}
notifyListeners(getLineBreak());
- notifyListenersOfLog();
updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
Message html = getFormattedError(ex, true);
notifyListeners(html);
LOG.log(Level.SEVERE, "Error installing.", ex);
+ notifyListeners(getLineBreak());
+ notifyListenersOfLog();
}
}
catch (Throwable t)
@@ -313,7 +314,6 @@
}
}
notifyListeners(getLineBreak());
- notifyListenersOfLog();
updateSummaryWithServerState(hmSummary);
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
ApplicationException ex = new ApplicationException(
@@ -322,6 +322,8 @@
Message msg = getFormattedError(ex, true);
notifyListeners(msg);
LOG.log(Level.SEVERE, "Error installing.", t);
+ notifyListeners(getLineBreak());
+ notifyListenersOfLog();
}
System.setErr(origErr);
System.setOut(origOut);
--
Gitblit v1.10.0