From cb211e9fbacbff14959354f377059ce0bab3ce6f Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 12 Jul 2007 13:34:59 +0000 Subject: [PATCH] [196301] check that the remote encoding isn't null before using it --- .../rse/internal/services/ssh/shell/SshHostShell.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java index 49c923830dd..79d54d1cbb9 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java @@ -14,6 +14,7 @@ * Contributors: * Martin Oberhuber (Wind River) - Adapted from LocalHostShell. * David McKnight (IBM) - [191599] Use the remote encoding specified in the host property page + * David McKnight (IBM) - [196301] Check that the remote encoding isn't null before using it *******************************************************************************/ package org.eclipse.rse.internal.services.ssh.shell; @@ -81,7 +82,14 @@ public class SshHostShell extends AbstractHostShell implements IHostShell { ((ChannelShell)fChannel).setEnv(envTable); } - fStdoutHandler = new SshShellOutputReader(this, new BufferedReader(new InputStreamReader(fChannel.getInputStream(), encoding)), false); + if (encoding != null) + { + fStdoutHandler = new SshShellOutputReader(this, new BufferedReader(new InputStreamReader(fChannel.getInputStream(), encoding)), false); + } + else + { + fStdoutHandler = new SshShellOutputReader(this, new BufferedReader(new InputStreamReader(fChannel.getInputStream())), false); + } fStderrHandler = new SshShellOutputReader(this, null,true); OutputStream outputStream = fChannel.getOutputStream(); //TODO check if encoding or command to execute needs to be considered