Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C520179B7 for ; Fri, 3 Apr 2015 15:24:42 +0000 (UTC) Received: (qmail 62034 invoked by uid 500); 3 Apr 2015 15:24:42 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 61981 invoked by uid 500); 3 Apr 2015 15:24:42 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 61634 invoked by uid 99); 3 Apr 2015 15:24:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2015 15:24:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D34E5E2F63; Fri, 3 Apr 2015 15:24:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Fri, 03 Apr 2015 15:24:50 -0000 Message-Id: <69bca7acfe664511b6eaa56a88f9c28b@git.apache.org> In-Reply-To: <7200bb1bb6674cb9846178626632388a@git.apache.org> References: <7200bb1bb6674cb9846178626632388a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/11] airavata git commit: Fixed AIRAVATA-1647. Fixed AIRAVATA-1647. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/732da594 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/732da594 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/732da594 Branch: refs/heads/emailMonitoring Commit: 732da594f0fc7fefbf1c0c53946db4cf035ef7db Parents: 764a239 Author: raminder Authored: Thu Apr 2 15:34:16 2015 -0400 Committer: raminder Committed: Thu Apr 2 15:34:16 2015 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/732da594/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java index cf9f931..3d18013 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java @@ -675,7 +675,7 @@ public class GSISSHAbstractCluster implements Cluster { String[] list = command.split(File.separator); command = list[list.length - 1]; // We are checking for stderr containing the command issued. Thus ignores the verbose logs in stderr. - if (stdErrorString != null && stdErrorString.contains(command) && !stdErrorString.contains("Warning")) { + if (stdErrorString != null && stdErrorString.contains(command.trim()) && !stdErrorString.contains("Warning")) { log.error("Standard Error output : " + stdErrorString); throw new SSHApiException(errorMsg + "\n\r StandardOutput: "+ stdOutputString + "\n\r StandardError: "+ stdErrorString); }else if(stdOutputString.contains("error")){