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 BF7E61871B for ; Tue, 30 Jun 2015 14:53:01 +0000 (UTC) Received: (qmail 69338 invoked by uid 500); 30 Jun 2015 14:53:01 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 69294 invoked by uid 500); 30 Jun 2015 14:53:01 -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 69285 invoked by uid 99); 30 Jun 2015 14:53:01 -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; Tue, 30 Jun 2015 14:53:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 898C6DFE7C; Tue, 30 Jun 2015 14:53:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: msmemon@apache.org To: commits@airavata.apache.org Message-Id: <54ffb1711c5c4715b932f2d7146fdb56@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: use stdout and stderr values from the client tier or set default naming scheme if null Date: Tue, 30 Jun 2015 14:53:01 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch a080ff7b2 -> a6ecc7cf6 use stdout and stderr values from the client tier or set default naming scheme if null Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a6ecc7cf Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a6ecc7cf Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a6ecc7cf Branch: refs/heads/airavata-0.15-release-branch Commit: a6ecc7cf60d9c68689faccbe17cf8533f3ced8cb Parents: a080ff7 Author: msmemon Authored: Tue Jun 30 16:52:52 2015 +0200 Committer: msmemon Committed: Tue Jun 30 16:52:52 2015 +0200 ---------------------------------------------------------------------- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a6ecc7cf/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java index 200ffbe..d95750f 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java @@ -381,10 +381,22 @@ public class BetterGfacImpl implements GFac { } if (objectType.getType() == DataType.STDOUT) { - objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stdout"); + String stdout = objectType.getValue(); + if(objectType.getValue() == null || "".equals(objectType.getValue())) { + objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stdout"); + } + else { + objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + stdout); + } } if (objectType.getType() == DataType.STDERR) { - objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stderr"); + String stderr = objectType.getValue(); + if(stderr == null || "".equals(stderr)) { + objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + jobExecutionContext.getApplicationName() + ".stderr"); + } + else { + objectType.setValue(jobExecutionContext.getOutputDir() + File.separator + stderr); + } } } jobExecutionContext.setOutMessageContext(new MessageContext(GFacUtils.getOuputParamMap(taskOutputs)));