Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry BLIND2019-03-07 08:31:58 -0500
committerThierry BLIND2019-04-10 11:34:42 -0400
commit0a4d0fba1f12cb9de6a565d9b2fe583541ffce17 (patch)
tree91c11cd651cd67325376069228a098ac1329872c
parent7737c6d87d7ac84062bb86320ba292cf3285a08a (diff)
downloadorg.eclipse.pdt-0a4d0fba1f12cb9de6a565d9b2fe583541ffce17.tar.gz
org.eclipse.pdt-0a4d0fba1f12cb9de6a565d9b2fe583541ffce17.tar.xz
org.eclipse.pdt-0a4d0fba1f12cb9de6a565d9b2fe583541ffce17.zip
Bug 544998 - Race condition between breakpoint operations and run
command Signed-off-by: Thierry BLIND <thierryblind@msn.com>
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpTarget.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpTarget.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpTarget.java
index 69359fbc5..d51448b83 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpTarget.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/xdebug/dbgp/model/DBGpTarget.java
@@ -505,6 +505,7 @@ public class DBGpTarget extends DBGpElement
stackFrames = null;
currentVariables = null;
superGlobalVars = null;
+ clearQueuedBpCmds();
// Clear any previous debug output object and create a new one.
debugOutput = new DebugOutput();
session.startSession();
@@ -1077,6 +1078,7 @@ public class DBGpTarget extends DBGpElement
setState(STATE_DISCONNECTED);
// TODO: May need to synchronize
if (session != null) {
+ clearQueuedBpCmds();
if (!isWebLaunch()) {
// not a web launch, but could be multi session so we
// can't just detach
@@ -1103,7 +1105,6 @@ public class DBGpTarget extends DBGpElement
langThread.setBreakpoints(null);
setState(STATE_STARTED_SESSION_WAIT);
resumed(DebugEvent.RESUME);
-
}
}
}
@@ -1199,6 +1200,7 @@ public class DBGpTarget extends DBGpElement
*/
private void resumed(int detail) {
setState(STATE_STARTED_RUNNING);
+ processQueuedBpCmds();
fireResumeEvent(detail);
langThread.fireResumeEvent(detail);
}
@@ -2256,6 +2258,10 @@ public class DBGpTarget extends DBGpElement
}
}
+ private void clearQueuedBpCmds() {
+ DBGpCmdQueue.clear();
+ }
+
/**
* process any queued breakpoint commands
*

Back to the top