Repository: airavata Updated Branches: refs/heads/master 722de6d1f -> 9e6c04b3b
added return type check based on the ssh command. it will ignore if a working message any other error or warning message is returned. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c1d7cf77 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c1d7cf77 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c1d7cf77 Branch: refs/heads/master Commit: c1d7cf77a0f623b33eb5ac5812442db753e5d05c Parents: f29d7e6 Author: raminder <[email protected]> Authored: Wed Aug 13 16:03:33 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Aug 13 16:03:33 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gsi/ssh/util/SSHUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c1d7cf77/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 f36d2d0..88c4e9a 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 @@ -209,7 +209,7 @@ public class SSHUtils { stdOutReader.onOutput(channel); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } channel.disconnect(); @@ -314,7 +314,7 @@ public class SSHUtils { channel.disconnect(); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } //since remote file is always a file we just return the file @@ -422,7 +422,7 @@ public class SSHUtils { out.flush(); } stdOutReader.onOutput(channel); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } @@ -570,7 +570,7 @@ public class SSHUtils { session.disconnect(); stdOutReader.onOutput(channel); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } } catch (Exception e) { @@ -686,7 +686,7 @@ public class SSHUtils { out.flush(); } stdOutReader.onOutput(channel); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("scp:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } @@ -724,7 +724,7 @@ public class SSHUtils { + session.getUserName(), e); } stdOutReader.onOutput(channel); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("mkdir:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } @@ -756,7 +756,7 @@ public class SSHUtils { } stdOutReader.onOutput(channel); stdOutReader.getStdOutputString(); - if (!stdOutReader.getStdErrorString().equals("")) { + if (!stdOutReader.getStdErrorString().contains("ls:")) { throw new SSHApiException(stdOutReader.getStdErrorString()); } channel.disconnect();
