airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [1/2] airavata git commit: Fixed issue with input destination construction
Date Mon, 02 Nov 2015 20:33:00 GMT
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 <shameerainfo@gmail.com>
Authored: Mon Nov 2 15:32:11 2015 -0500
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
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");
             }


Mime
View raw message