commit 85885d9cbfb0c94b53d8be62bf1c8ea637291a18
author Shameera Rathnayaka <shameerainfo@gmail.com> Mon Nov 02 15:32:22 2015 -0500
committer Shameera Rathnayaka <shameerainfo@gmail.com> Mon Nov 02 15:32:22 2015 -0500
tree 542dc0faa79094efaed6e77ae5c2d2633bdd051a
parent d139f697d7a8812722a989df76199f93b813ea26
parent 2d6ee02a5ae8e4769b33138d1ecfd5597c84fc94

Merge branch 'orchestratorTaskBreakdown' of https://git-wip-us.apache.org/repos/asf/airavata into orchestratorTaskBreakdown

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 81980b9..1e2ad58 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
@@ -512,8 +512,11 @@
         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");
         }
@@ -547,8 +550,11 @@
             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");
             }