From b2fc9ab4ed68c71e97edde5a65c05447727b96a0 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 21 Apr 2003 17:57:02 +0000 Subject: [PATCH] Disconnnect: target should be disconnected before terminate the session because of race condition. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 5 +++++ .../cdt/debug/internal/core/model/CDebugTarget.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 18cbead14e2..057cd99614f 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,8 @@ +2003-04-21 Mikhail Khodjaiants + Disconnnect: target should be disconnected before terminate the session + because of race condition. + * CDebugTarget.java + 2003-04-21 Mikhail Khodjaiants Unnecessary error logging (bug 36682). * CValue.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index 67d73dd798a..a24899eccc6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -802,6 +802,15 @@ public class CDebugTarget extends CDebugElement try { getCDITarget().disconnect(); + try + { + // wait until the target is disconnected ???? + for( int i = 0; !isDisconnected() && i < 5; ++i ) + Thread.sleep( 1000 ); + } + catch( InterruptedException ie ) + { + } getCDISession().terminate(); } catch( CDIException e )