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 47B18D9FD for ; Thu, 31 Jan 2013 22:17:12 +0000 (UTC) Received: (qmail 38092 invoked by uid 500); 31 Jan 2013 22:17:12 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 38060 invoked by uid 500); 31 Jan 2013 22:17:12 -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 38053 invoked by uid 99); 31 Jan 2013 22:17:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2013 22:17:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2013 22:17:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D2CB2388A29; Thu, 31 Jan 2013 22:16:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441224 - /airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GramProviderUtils.java Date: Thu, 31 Jan 2013 22:16:50 -0000 To: commits@airavata.apache.org From: lahiru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130131221650.3D2CB2388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lahiru Date: Thu Jan 31 22:16:49 2013 New Revision: 1441224 URL: http://svn.apache.org/viewvc?rev=1441224&view=rev Log: fixing a test failure for GramProviderTest. Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GramProviderUtils.java Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GramProviderUtils.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GramProviderUtils.java?rev=1441224&r1=1441223&r2=1441224&view=diff ============================================================================== --- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GramProviderUtils.java (original) +++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/GramProviderUtils.java Thu Jan 31 22:16:49 2013 @@ -146,7 +146,7 @@ public class GramProviderUtils { String stdout = ftp.readRemoteFile(stdoutURI, gssCred, localStdOutFile); String stderr = ftp.readRemoteFile(stderrURI, gssCred, localStdErrFile); - OutputUtils.fillOutputFromStdout(jobExecutionContext, stdout, stderr); + return OutputUtils.fillOutputFromStdout(jobExecutionContext, stdout, stderr); // Map stringMap = null; // MessageContext output = jobExecutionContext.getOutput(); // for (Iterator iterator = output.getNames(); iterator.hasNext(); ) { @@ -213,11 +213,8 @@ public class GramProviderUtils { throw new GFacProviderException("Output is not produced in stdout:" + e.getMessage(), jobExecutionContext, e, readLastLinesofStdOut(localStdErrFile.getPath(), 20)); } } - - /* - * If the execution reach here, all GridFTP Endpoint is failed. - */ - throw pe; + //todo this return has to be removed + return null; } catch (Exception e) { // jobExecutionContext.getExecutionContext().getNotifier().executionFail(jobExecutionContext,e,readLastLinesofStdOut(localStdErrFile.getPath(), 20));