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 454CB17D59 for ; Thu, 19 Mar 2015 19:11:31 +0000 (UTC) Received: (qmail 58507 invoked by uid 500); 19 Mar 2015 19:11:23 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 58442 invoked by uid 500); 19 Mar 2015 19:11:23 -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 56684 invoked by uid 99); 19 Mar 2015 19:11:22 -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; Thu, 19 Mar 2015 19:11:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B41CFE195E; Thu, 19 Mar 2015 19:11:19 +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: Thu, 19 Mar 2015 19:12:06 -0000 Message-Id: <6ded360a8a5148b19884f28c7fe040fc@git.apache.org> In-Reply-To: <3e66fb1b0cae40f5bf736e2dcd8e1da2@git.apache.org> References: <3e66fb1b0cae40f5bf736e2dcd8e1da2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] airavata git commit: Changed according to AIRAVATA-1634 in clone fix. AIRAVATA-1631 Changed according to AIRAVATA-1634 in clone fix. AIRAVATA-1631 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7d57c098 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7d57c098 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7d57c098 Branch: refs/heads/new-workflow-design Commit: 7d57c09865be7da0dff3ec506e5b6bd00cbf9268 Parents: f708304 Author: raminder Authored: Tue Mar 17 12:41:28 2015 -0400 Committer: raminder Committed: Tue Mar 17 12:41:28 2015 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/7d57c098/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 5dcea2e..9c3e049 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 @@ -385,18 +385,16 @@ public class BetterGfacImpl implements GFac,Watcher { for (OutputDataObjectType objectType : taskOutputs){ if (objectType.getType() == DataType.URI && objectType.getValue() != null){ - // this should be also the relative path : in case of clone, this will contain full path String filePath = objectType.getValue(); - if(objectType.getLocation() == null && objectType.getLocation().isEmpty() && filePath.contains(File.separator)){ - filePath = jobExecutionContext.getOutputDir() + File.separator + filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length()); - } - //output is not in working folder + // if output is not in working folder if (objectType.getLocation() != null && !objectType.getLocation().isEmpty()) { if(objectType.getLocation().startsWith(File.separator)){ filePath = objectType.getLocation() + File.separator + filePath; }else{ filePath = jobExecutionContext.getOutputDir() + File.separator + objectType.getLocation() + File.separator + filePath; } + }else{ + filePath = jobExecutionContext.getOutputDir() + File.separator + filePath; } objectType.setValue(filePath);