[airavata] branch staging updated: Fixing the bug of scratch location having a trailing file separator

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/staging by this push:
     new cccdbf3  Fixing the bug of scratch location having a trailing file separator
cccdbf3 is described below

commit cccdbf3b7bbb9d5e5218bc6788ae984fc73f012d
Author: dimuthu <di...@gmail.com>
AuthorDate: Fri May 18 14:10:32 2018 -0400

    Fixing the bug of scratch location having a trailing file separator
---
 .../airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 53f2a94..b8ecc6b 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
@@ -615,8 +615,9 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
         DataStagingTaskModel submodel = new DataStagingTaskModel();
         ComputeResourceDescription computeResource = registryClient.
                 getComputeResource(processModel.getComputeResourceId());
-        String workingDir = OrchestratorUtils.getScratchLocation(processModel, gatewayId) +
-                File.separator + processModel.getProcessId() + File.separator;
+        String scratchLocation = OrchestratorUtils.getScratchLocation(processModel, gatewayId);
+        String workingDir = (scratchLocation.endsWith(File.separator) ? scratchLocation : scratchLocation + File.separator) +
+                processModel.getProcessId() + File.separator;
         URI destination = null;
         try {
             DataMovementProtocol dataMovementProtocol =

-- 
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.