From fecef62f250b199b5376d46cce209eb4989ad984 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Fri, 6 May 2011 15:30:40 +0000 Subject: [PATCH] Bug 344988: The implementations of IProcesses.terminate don't always complete the RequestMonitor --- .../src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java | 2 +- .../src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java index 405350fe0cf..4f1a6aebb52 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java @@ -367,7 +367,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses { Platform.getPreferencesService().getBoolean("org.eclipse.cdt.dsf.gdb.ui", //$NON-NLS-1$ IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB, true, null)) { - fGdb.terminate(new RequestMonitor(ImmediateExecutor.getInstance(), null)); + fGdb.terminate(rm); } else if (thread instanceof IMIProcessDMContext) { getDebuggingContext( thread, diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java index dd25e09ace7..e4a72e26793 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java @@ -1191,7 +1191,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService Platform.getPreferencesService().getBoolean("org.eclipse.cdt.dsf.gdb.ui", //$NON-NLS-1$ IGdbDebugPreferenceConstants.PREF_AUTO_TERMINATE_GDB, true, null))) { - fCommandControl.terminate(new RequestMonitor(ImmediateExecutor.getInstance(), null)); + fCommandControl.terminate(rm); } else if (thread instanceof IMIProcessDMContext) { getDebuggingContext( thread,