Attachment 162125 Details for Bug 305949 – Fix

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

[patch] Fix

zpatch1.txt (text/plain), 2.13 KB, created by Marc Khouzam

on 2010-03-15 23:11:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-03-15 23:11:41 EDT

Size: 2.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java,v
>retrieving revision 1.13
>diff -u -r1.13 GdbLaunchDelegate.java
>--- src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java	9 Mar 2010 05:25:00 -0000	1.13
>+++ src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java	16 Mar 2010 03:07:15 -0000
>@@ -13,6 +13,7 @@
>  *******************************************************************************/
> package org.eclipse.cdt.dsf.gdb.launching; 
> 
>+import java.util.concurrent.CancellationException;
> import java.util.concurrent.ExecutionException;
> 
> import org.eclipse.cdt.core.model.ICProject;
>@@ -140,6 +141,9 @@
>             throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
>         } catch (ExecutionException e1) {
>             throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in services launch sequence", e1.getCause())); //$NON-NLS-1$
>+        } catch (CancellationException e1) {
>+        	// Launch aborted, so exit cleanly
>+        	return;
>         }
>         
>         if (monitor.isCanceled())
>@@ -173,6 +177,9 @@
>             throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
>         } catch (ExecutionException e1) {
>             throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in final launch sequence", e1.getCause())); //$NON-NLS-1$
>+        } catch (CancellationException e1) {
>+        	// Launch aborted, so exit cleanly
>+        	return;
>         } finally {
>             if (!succeed) {
>                 // finalLaunchSequence failed. Shutdown the session so that all started

Flags:

marc.khouzam: iplog+

Actions: View | Diff

Attachments on bug 305949: 162125