TCF RSE: fixed NPE when launching a terminal returns an error

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);