Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2013-03-15 15:48:59 -0400
committerEugene Tarassov2013-03-15 15:48:59 -0400
commite6a8eba0040f9d7575fa735ef034b9f66fed21b3 (patch)
tree0f2f6f527215bcde7fb6581aea66580a9546ab17 /plugins
parent8068562b829f7f9b2800d7c848964eb063876c79 (diff)
downloadorg.eclipse.tcf-e6a8eba0040f9d7575fa735ef034b9f66fed21b3.tar.gz
org.eclipse.tcf-e6a8eba0040f9d7575fa735ef034b9f66fed21b3.tar.xz
org.eclipse.tcf-e6a8eba0040f9d7575fa735ef034b9f66fed21b3.zip
TCF RSE: fixed NPE when launching a terminal returns an error
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java
index f198fd145..cc169f5ff 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java
@@ -220,14 +220,14 @@ public class TCFTerminalShell extends AbstractTerminalShell {
streams = ((TCFConnectorService)sessionProvider).getService(IStreams.class);
fSessionProvider.onStreamsConnecting();
terminals.launch(ptyType, encoding, environment, new ITerminals.DoneLaunch() {
+ @Override
public void doneLaunch(IToken token, Exception error, ITerminals.TerminalContext ctx) {
-
if (ctx != null) {
terminalContext = ctx;
terminals.addListener(listeners);
+ fSessionProvider.onStreamsID(ctx.getStdInID());
+ fSessionProvider.onStreamsID(ctx.getStdOutID());
}
- fSessionProvider.onStreamsID(ctx.getStdInID());
- fSessionProvider.onStreamsID(ctx.getStdOutID());
fSessionProvider.onStreamsConnected();
if (error != null) error(error);
else done(ctx);

Back to the top