Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 305949
Collapse All | Expand All

(-)src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java (+7 lines)
Lines 13-18 Link Here
13
 *******************************************************************************/
13
 *******************************************************************************/
14
package org.eclipse.cdt.dsf.gdb.launching; 
14
package org.eclipse.cdt.dsf.gdb.launching; 
15
15
16
import java.util.concurrent.CancellationException;
16
import java.util.concurrent.ExecutionException;
17
import java.util.concurrent.ExecutionException;
17
18
18
import org.eclipse.cdt.core.model.ICProject;
19
import org.eclipse.cdt.core.model.ICProject;
Lines 140-145 Link Here
140
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
141
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
141
        } catch (ExecutionException e1) {
142
        } catch (ExecutionException e1) {
142
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in services launch sequence", e1.getCause())); //$NON-NLS-1$
143
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in services launch sequence", e1.getCause())); //$NON-NLS-1$
144
        } catch (CancellationException e1) {
145
        	// Launch aborted, so exit cleanly
146
        	return;
143
        }
147
        }
144
        
148
        
145
        if (monitor.isCanceled())
149
        if (monitor.isCanceled())
Lines 173-178 Link Here
173
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
177
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.INTERNAL_ERROR, "Interrupted Exception in dispatch thread", e1)); //$NON-NLS-1$
174
        } catch (ExecutionException e1) {
178
        } catch (ExecutionException e1) {
175
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in final launch sequence", e1.getCause())); //$NON-NLS-1$
179
            throw new DebugException(new Status(IStatus.ERROR, GdbPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Error in final launch sequence", e1.getCause())); //$NON-NLS-1$
180
        } catch (CancellationException e1) {
181
        	// Launch aborted, so exit cleanly
182
        	return;
176
        } finally {
183
        } finally {
177
            if (!succeed) {
184
            if (!succeed) {
178
                // finalLaunchSequence failed. Shutdown the session so that all started
185
                // finalLaunchSequence failed. Shutdown the session so that all started

Return to bug 305949