Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2014-12-16 10:33:44 +0000
committerTobias Schwarz2014-12-16 10:33:44 +0000
commited4374c81484193eaf3fa42b3b98ab5ffe0fa34d (patch)
tree7df47896bf42f67872f67a41b7e9a1b351ee9319 /target_explorer/plugins
parentd1b3a98d8f5983b49e62559e1365732b09f33785 (diff)
downloadorg.eclipse.tcf-ed4374c81484193eaf3fa42b3b98ab5ffe0fa34d.tar.gz
org.eclipse.tcf-ed4374c81484193eaf3fa42b3b98ab5ffe0fa34d.tar.xz
org.eclipse.tcf-ed4374c81484193eaf3fa42b3b98ab5ffe0fa34d.zip
SM: ignore errors when task is already stopped
Diffstat (limited to 'target_explorer/plugins')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessStreamsListener.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessStreamsListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessStreamsListener.java
index ec389c056..1c8a78ec7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessStreamsListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/launcher/ProcessStreamsListener.java
@@ -226,7 +226,7 @@ public class ProcessStreamsListener implements IChannelManager.IStreamsListener,
// An error occurred -> Dump to the error log
e = ExceptionUtils.checkAndUnwrapException(e);
// Check if the blocking read task got canceled
- if (!(e instanceof CancellationException)) {
+ if (!isStopped() && !(e instanceof CancellationException)) {
// Log the error to the user, might be something serious
IStatus status = new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(),
NLS.bind(Messages.ProcessStreamReaderRunnable_error_readFailed, streamId, e.getLocalizedMessage()),
@@ -302,7 +302,8 @@ public class ProcessStreamsListener implements IChannelManager.IStreamsListener,
@Override
public void doneRead(IToken token, Exception error, int lostSize, byte[] data, boolean eos) {
if (error == null) done(new ReadData(lostSize, data, eos));
- else error(error);
+ else if (!isStopped())
+ error(error);
}
});
}

Back to the top