Attachment 160115 Details for Bug 300096 – Further fix

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

[patch] Further fix

zpatch.txt (text/plain), 2.92 KB, created by Marc Khouzam

on 2010-02-24 15:23:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-02-24 15:23:08 EST

Size: 2.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java,v
>retrieving revision 1.4
>diff -u -r1.4 MIRunControlEventProcessor.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java	11 Feb 2010 19:10:27 -0000	1.4
>+++ src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java	24 Feb 2010 20:14:59 -0000
>@@ -14,6 +14,8 @@
> import java.util.LinkedList;
> import java.util.List;
> 
>+import org.eclipse.cdt.dsf.datamodel.DMContexts;
>+import org.eclipse.cdt.dsf.datamodel.IDMContext;
> import org.eclipse.cdt.dsf.debug.service.IRunControl;
> import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext;
> import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMContext;
>@@ -291,16 +293,23 @@
>             	// MIStoppedEvent ourselves
>             	if (cmd instanceof CLICommand<?>) {
>                 	IRunControl runControl = fServicesTracker.getService(IRunControl.class);
>-                	IMIProcesses procService = fServicesTracker.getService(IMIProcesses.class);
>-                	if (runControl != null && procService != null) {
>-                		String groupId = MIProcesses.UNIQUE_GROUP_ID;
>-                		IProcessDMContext procDmc = procService.createProcessContext(fControlDmc, groupId);
>-                		IContainerDMContext processContainerDmc = procService.createContainerContext(procDmc, groupId);
>-                		
>-                		if (runControl.isSuspended(processContainerDmc) == false) {
>-                			MIEvent<?> event = MIStoppedEvent.parse(processContainerDmc, id, rr.getMIResults());
>+                	if (runControl != null) {
>+                		IDMContext dmc = ((CLICommand<?>)cmd).getContext();
>+                		IExecutionDMContext execDmc = 
>+                			DMContexts.getAncestorOfType(dmc, IExecutionDMContext.class);
>+            		
>+                		if (execDmc == null) {
>+                			IMIProcesses procService = fServicesTracker.getService(IMIProcesses.class);
>+                			if (procService != null) {
>+                				String groupId = MIProcesses.UNIQUE_GROUP_ID;
>+                				IProcessDMContext procDmc = procService.createProcessContext(fControlDmc, groupId);
>+                				execDmc = procService.createContainerContext(procDmc, groupId);
>+                			}
>+                		}
>+                		if (execDmc != null && runControl.isSuspended(execDmc) == false) {
>+                			MIEvent<?> event = MIStoppedEvent.parse(execDmc, id, rr.getMIResults());
>                 			fCommandControl.getSession().dispatchEvent(event, fCommandControl.getProperties());
>-            			}
>+                		}
>             		}
>             	}
>             }

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 300096: 156549 | 159033 | 159054 | 160115