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 CFEFE18DA2 for ; Mon, 2 Nov 2015 20:33:00 +0000 (UTC) Received: (qmail 22063 invoked by uid 500); 2 Nov 2015 20:33:00 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 21953 invoked by uid 500); 2 Nov 2015 20:33:00 -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 21933 invoked by uid 99); 2 Nov 2015 20:33:00 -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; Mon, 02 Nov 2015 20:33:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 77DE7E0593; Mon, 2 Nov 2015 20:33:00 +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: Mon, 02 Nov 2015 20:33:00 -0000 Message-Id: <04e52eb0d5b248d8acab29d5e558ccf5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] airavata git commit: Fixed issue with input destination construction Repository: airavata Updated Branches: refs/heads/orchestratorTaskBreakdown 2d6ee02a5 -> 85885d9cb Fixed issue with input destination construction Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d139f697 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d139f697 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d139f697 Branch: refs/heads/orchestratorTaskBreakdown Commit: d139f697d7a8812722a989df76199f93b813ea26 Parents: 6fc864e Author: Shameera Rathnayaka Authored: Mon Nov 2 15:32:11 2015 -0500 Committer: Shameera Rathnayaka Committed: Mon Nov 2 15:32:11 2015 -0500 ---------------------------------------------------------------------- .../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/d139f697/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java index be65a70..61a70d1 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java @@ -509,8 +509,11 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ URI destination = null; try { DataMovementProtocol dataMovementProtocol = OrchestratorUtils.getPreferredDataMovementProtocol(orchestratorContext, processModel, gatewayId); - destination = new URI(dataMovementProtocol.name(), computeResource.getHostName(), - computeResourcePreference.getLoginUserName(), OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId), remoteOutputDir , null, null); + destination = new URI(dataMovementProtocol.name(), + computeResourcePreference.getLoginUserName(), + computeResource.getHostName(), + OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId), + remoteOutputDir , null, null); } catch (URISyntaxException e) { throw new TaskException("Error while constructing destination file URI"); } @@ -544,8 +547,11 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ URI source = null; try { DataMovementProtocol dataMovementProtocol = OrchestratorUtils.getPreferredDataMovementProtocol(orchestratorContext, processModel, gatewayId); - source = new URI(dataMovementProtocol.name(), computeResource.getHostName(), - computeResourcePreference.getLoginUserName(), OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId), remoteOutputDir + processOutput.getValue(), null, null); + source = new URI(dataMovementProtocol.name(), + computeResourcePreference.getLoginUserName(), + computeResource.getHostName(), + OrchestratorUtils.getDataMovementPort(orchestratorContext, processModel, gatewayId), + remoteOutputDir + processOutput.getValue(), null, null); } catch (URISyntaxException e) { throw new TaskException("Error while constructing source file URI"); }