Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A9DDB200CAE for ; Tue, 16 May 2017 17:49:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A8892160BD7; Tue, 16 May 2017 15:49:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 136F0160BDC for ; Tue, 16 May 2017 17:49:53 +0200 (CEST) Received: (qmail 76432 invoked by uid 500); 16 May 2017 15:49:52 -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 75262 invoked by uid 99); 16 May 2017 15:49:51 -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, 16 May 2017 15:49:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48E62E3AA4; Tue, 16 May 2017 15:49:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smarru@apache.org To: commits@airavata.apache.org Date: Tue, 16 May 2017 15:50:17 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] airavata git commit: fixing bug in parentPath dir archived-at: Tue, 16 May 2017 15:49:55 -0000 fixing bug in parentPath dir Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7027f44b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7027f44b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7027f44b Branch: refs/heads/registry-refactoring Commit: 7027f44b08f2589747bc62141ea1bad2084c5e1c Parents: 04abb1e Author: scnakandala Authored: Wed May 3 17:05:03 2017 -0400 Committer: scnakandala Committed: Wed May 3 17:05:03 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/7027f44b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java index e7451c4..138f4d9 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java @@ -159,8 +159,9 @@ public class SCPDataStageTask implements Task { //Wildcard for file name. Has to find the correct name. if(fileName.startsWith("*.")){ String destParentPath = (new File(destinationURI.getPath())).getParentFile().getPath(); + String sourceParentPath = (new File(sourceURI.getPath())).getParentFile().getPath(); String temp = taskContext.getParentProcessContext().getDataMovementRemoteCluster() - .getFileNameFromExtension(fileName.substring(2), destParentPath, sshSession); + .getFileNameFromExtension(fileName.substring(2), sourceParentPath, sshSession); if(temp != null && temp != ""){ fileName = temp; }