Repository: airavata Updated Branches: refs/heads/master 650933484 -> 552f9b1e5
remove channel.disconnect() Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/552f9b1e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/552f9b1e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/552f9b1e Branch: refs/heads/master Commit: 552f9b1e537ae12d54f8e455f11c6bb3b825c676 Parents: 6509334 Author: lahiru <[email protected]> Authored: Fri Oct 3 16:18:16 2014 -0400 Committer: lahiru <[email protected]> Committed: Fri Oct 3 16:18:16 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gsi/ssh/api/CommandExecutor.java | 8 ++++---- .../java/org/apache/airavata/gsi/ssh/util/SSHUtils.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/552f9b1e/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java index d26ca06..6f9a36d 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java @@ -75,7 +75,7 @@ public class CommandExecutor { channel.connect(); } catch (JSchException e) { - channel.disconnect(); +// channel.disconnect(); // session.disconnect(); throw new SSHApiException("Unable to retrieve command output. Command - " + command, e); } @@ -83,7 +83,7 @@ public class CommandExecutor { commandOutput.onOutput(channel); //Only disconnecting the channel, session can be reused - channel.disconnect(); +// channel.disconnect(); return session; } @@ -253,7 +253,7 @@ public class CommandExecutor { channel.connect(); } catch (JSchException e) { - channel.disconnect(); +// channel.disconnect(); // session.disconnect(); throw new SSHApiException("Unable to retrieve command output. Command - " + command + @@ -264,7 +264,7 @@ public class CommandExecutor { commandOutput.onOutput(channel); - channel.disconnect(); +// channel.disconnect(); // session.disconnect(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/552f9b1e/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java index 9cafde6..2d2a4ca 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java @@ -212,7 +212,7 @@ public class SSHUtils { if (stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } - channel.disconnect(); +// channel.disconnect(); } /** @@ -312,7 +312,7 @@ public class SSHUtils { stdOutReader.onOutput(channel); - channel.disconnect(); +// channel.disconnect(); if (stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } @@ -727,7 +727,7 @@ public class SSHUtils { throw new SSHApiException(stdOutReader.getStdErrorString()); } - channel.disconnect(); +// channel.disconnect(); } public static List<String> listDirectory(String path, Session session) throws IOException, JSchException, SSHApiException { @@ -745,7 +745,7 @@ public class SSHUtils { channel.connect(); } catch (JSchException e) { - channel.disconnect(); +// channel.disconnect(); // session.disconnect(); throw new SSHApiException("Unable to retrieve command output. Command - " + command + @@ -758,7 +758,7 @@ public class SSHUtils { if (stdOutReader.getStdErrorString().contains("ls:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } - channel.disconnect(); +// channel.disconnect(); return Arrays.asList(stdOutReader.getStdOutputString().split("\n")); }
