diff options
| author | Marc Khouzam | 2014-11-28 22:55:44 +0000 |
|---|---|---|
| committer | Marc Khouzam | 2014-12-02 15:23:31 +0000 |
| commit | f327ccd103adce493f034dc64d45c23da7f9b9af (patch) | |
| tree | e6efdf643f7a588cd655ed10fed18e6732980254 | |
| parent | b53246227a4f3470545094eb0657dd5873a0b0e6 (diff) | |
| download | org.eclipse.cdt-f327ccd103adce493f034dc64d45c23da7f9b9af.tar.gz org.eclipse.cdt-f327ccd103adce493f034dc64d45c23da7f9b9af.tar.xz org.eclipse.cdt-f327ccd103adce493f034dc64d45c23da7f9b9af.zip | |
Bug 453568 - RM.done() can be called twice under heavy load at termination
Change-Id: I2a02ff21a1b4a928df29b5c95c6293e7667bc48f
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/37312
Reviewed-by: Alvaro Sanchez-Leon <alvsan09@gmail.com>
| -rw-r--r-- | dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java index 1e0607dd39b..3f0ac45f7a0 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java @@ -346,8 +346,9 @@ public class GDBControl extends AbstractMIControl implements IGDBControl { public void handleCompleted() { if (isSuccess()) { // Cancel the time out runnable (if it hasn't run yet). - forceQuitTask.cancel(false); - rm.done(); + if (forceQuitTask.cancel(false)) { + rm.done(); + } } // else: the forceQuitTask has or will handle it. // It is good to wait for the forceQuitTask to trigger |