Attachment 179101 Details for Bug 325394 – Proposed fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed fix

325394.patch (text/plain), 2.17 KB, created by Anton Leherbauer

on 2010-09-17 06:55:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Leherbauer

Created: 2010-09-17 06:55:52 EDT

Size: 2.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.ui
>Index: src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java,v
>retrieving revision 1.17
>diff -u -r1.17 DsfSourceDisplayAdapter.java
>--- src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java	26 Jul 2010 22:39:53 -0000	1.17
>+++ src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java	17 Sep 2010 10:53:58 -0000
>@@ -674,6 +674,7 @@
> 	}
> 
> 	private void doDisplaySource(final IFrameDMContext context, final IWorkbenchPage page, final boolean force, final boolean eventTriggered) {
>+	    if (DEBUG) System.out.println("[DsfSourceDisplayAdapter] doDisplaySource ctx="+context+" eventTriggered="+eventTriggered); //$NON-NLS-1$
>     	if (context.getLevel() < 0) {
>     		return;
>     	}
>@@ -748,6 +749,13 @@
>     		}
>     		// cancel running display job
>     		fRunningDisplayJob.cancel();
>+            // make sure doneStepping() is called even if the job never ran - bug 325394
>+    		if (fRunningDisplayJob.fEventTriggered && !fRunningDisplayJob.fDoneStepping.getAndSet(true)) {
>+    		    // ... but not if this request is event-triggered for the same context (duplicate suspended event)
>+    		    if (!eventTriggered || !fRunningDisplayJob.getDmc().equals(lookupResult.getDmc())) {
>+    		        doneStepping(fRunningDisplayJob.getDmc());
>+    		    }
>+    		}
>     	}
>     	if (fRunningClearingJob != null) {
>             // Wait for the clearing job to finish, instead, set the 
>@@ -843,6 +851,7 @@
>     public void eventDispatched(final IRunControl.ISuspendedDMEvent e) {
> 		updateStepTiming();
>     	if (e.getReason() == StateChangeReason.STEP || e.getReason() == StateChangeReason.BREAKPOINT) {
>+    	    if (DEBUG) System.out.println("[DsfSourceDisplayAdapter] eventDispatched e="+e); //$NON-NLS-1$
> 	        // trigger source display immediately (should be optional?)
> 	        Display.getDefault().asyncExec(new Runnable() {
> 				public void run() {

Flags:

aleherb+eclipse: iplog-

Actions: View | Diff

Attachments on bug 325394: 179101 | 182470