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 <[email protected]> Authored: Tue Jun 30 16:52:52 2015 +0200 Committer: msmemon <[email protected]> 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)));
