Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Hultgren2018-04-18 10:45:15 -0400
committerJonah Graham2018-04-20 07:12:18 -0400
commit4dd0d4ec05c9242bd3d904b5b6b6eb7dc0312cd0 (patch)
tree72f0cc26ce26a07042986442996a8a290beea914
parent72a51e79d9694032b967c19b789b58701a297eee (diff)
downloadorg.eclipse.cdt-4dd0d4ec05c9242bd3d904b5b6b6eb7dc0312cd0.tar.gz
org.eclipse.cdt-4dd0d4ec05c9242bd3d904b5b6b6eb7dc0312cd0.tar.xz
org.eclipse.cdt-4dd0d4ec05c9242bd3d904b5b6b6eb7dc0312cd0.zip
Bug 533769 - Show error messages directly
Include the error message in the message shown directly in the error dialog. Change-Id: I8d6e65353750ee59966ede59b75ebc6256658cb6 Signed-off-by: Samuel Hultgren <samuel.hultgren@st.com>
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
index 12b987b832..b8679645c9 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
@@ -16,6 +16,7 @@
* Marc Khouzam (Ericsson) - Cleanup the launch if it is cancelled (Bug 374374)
* Marc-Andre Laperle - Bug 382462
* Marc Khouzam (Ericsson - Show GDB version in debug view node label (Bug 455408)
+ * Samuel Hultgren (STMicroelectronics) - Bug 533769
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.launching;
@@ -230,7 +231,12 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2
} catch (InterruptedException e1) {
throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
} catch (ExecutionException e1) {
- throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in final launch sequence", e1.getCause())); //$NON-NLS-1$
+ final Throwable cause = e1.getCause();
+ String message = ""; //$NON-NLS-1$
+ if (cause != null) {
+ message = ":\n\n" + cause.getMessage(); //$NON-NLS-1$
+ }
+ throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in final launch sequence" + message, cause)); //$NON-NLS-1$
} catch (CancellationException e1) {
// Launch aborted, so exit cleanly
return;

Back to the top