airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: Fixed RemoteDir issue
Date Fri, 11 Mar 2016 21:00:13 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 4a04fab74 -> 4968ee8c3


Fixed RemoteDir issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4968ee8c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4968ee8c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4968ee8c

Branch: refs/heads/develop
Commit: 4968ee8c30566af8d17657537de51eb3d050a35e
Parents: 4a04fab
Author: Shameera Rathnayaka <shameerainfo@gmail.com>
Authored: Fri Mar 11 16:00:08 2016 -0500
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
Committed: Fri Mar 11 16:00:08 2016 -0500

----------------------------------------------------------------------
 .../airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4968ee8c/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 559f007..ca7be48 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
@@ -572,8 +572,8 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
             ComputeResourcePreference computeResourcePreference = OrchestratorUtils.getComputeResourcePreference(orchestratorContext,
processModel, gatewayId);
             ComputeResourceDescription computeResource = orchestratorContext.getRegistry().getAppCatalog().getComputeResource().getComputeResource(processModel.getComputeResourceId());
 
-            String remoteOutputDir = computeResourcePreference.getScratchLocation(); // TODO
check tail '/' in scratch path
-            remoteOutputDir = remoteOutputDir.endsWith("/") ? remoteOutputDir + processModel.getProcessId()
: remoteOutputDir + "/" + processModel.getProcessId();
+            String remoteOutputDir = computeResourcePreference.getScratchLocation() + File.separator
+ processModel.getProcessId();
+            remoteOutputDir = remoteOutputDir.endsWith("/") ? remoteOutputDir : remoteOutputDir
+ "/";
             DataStagingTaskModel submodel = new DataStagingTaskModel();
             DataMovementProtocol dataMovementProtocol = OrchestratorUtils.getPreferredDataMovementProtocol(orchestratorContext,
processModel, gatewayId);
             URI source = null;


Mime
View raw message