Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-08-27 01:52:11 -0400
committerUwe Stieber2014-08-27 01:52:57 -0400
commit260bce2243120e040e761ce40981f028cdd06c10 (patch)
treedae63268accb1c9ba9e8abe322fc5b71bc2f1dff
parent26d73c01ebb835d2106cdf11493e197f832385e5 (diff)
downloadorg.eclipse.tcf-260bce2243120e040e761ce40981f028cdd06c10.tar.gz
org.eclipse.tcf-260bce2243120e040e761ce40981f028cdd06c10.tar.xz
org.eclipse.tcf-260bce2243120e040e761ce40981f028cdd06c10.zip
Target Explorer: Fix WB4-4036: TCF error raised when disconnecting from VxSim from the UI
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/internal/services/DebugService.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/internal/services/DebugService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/internal/services/DebugService.java
index ca8eb7136..20ec528e2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/internal/services/DebugService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/internal/services/DebugService.java
@@ -9,6 +9,9 @@
*******************************************************************************/
package org.eclipse.tcf.te.tcf.launch.ui.internal.services;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -201,7 +204,14 @@ public class DebugService extends AbstractService implements IDebugService {
}
}
} catch (Exception e) {
- callback.done(this, StatusHelper.getStatus(e));
+ if (e instanceof ExecutionException && "TCF task aborted".equals(e.getMessage()) //$NON-NLS-1$
+ || e.getCause() instanceof CancellationException) {
+ // This disconnect of the debug launch timed out. We are going
+ // to ignore this as we are detaching from the debugger anyway.
+ callback.done(this, Status.OK_STATUS);
+ } else {
+ callback.done(this, StatusHelper.getStatus(e));
+ }
return;
}
}

Back to the top