Attachment 182470 Details for Bug 325394 – Follow-up fix

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

[patch] Follow-up fix

325394-2.patch (text/plain), 1.59 KB, created by Anton Leherbauer

on 2010-11-05 09:21:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Leherbauer

Created: 2010-11-05 09:21:51 EDT

Size: 1.59 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.16.2.1
>diff -u -r1.16.2.1 DsfSourceDisplayAdapter.java
>--- src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java	28 Sep 2010 10:29:19 -0000	1.16.2.1
>+++ src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java	5 Nov 2010 13:20:41 -0000
>@@ -721,6 +721,19 @@
>         // If there is a previous lookup job running, cancel it.
>         if (fRunningLookupJob != null) {
>             fRunningLookupJob.cancel();
>+            if (!eventTriggered && frameData.isIdentical(fRunningLookupJob.fFrameData)) {
>+                // identical location - we are done
>+                return;
>+            }
>+            // cancel running lookup job
>+            fRunningLookupJob.cancel();
>+            // make sure doneStepping() is called even if the job never ran - bug 325394
>+    		if (fRunningLookupJob.fEventTriggered) {
>+    		    // ... but not if this request is event-triggered for the same context (duplicate suspended event)
>+    		    if (!eventTriggered || !fRunningLookupJob.getDmc().equals(frameData.fDmc)) {
>+    		        doneStepping(fRunningLookupJob.getDmc());
>+    		    }
>+    		}
>         }
>         
>         fRunningLookupJob = new LookupJob(frameData, page, eventTriggered);

Flags:

aleherb+eclipse: iplog-

Actions: View | Diff

Attachments on bug 325394: 179101 | 182470