airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [29/42] airavata git commit: fixing wrong remoteOutputDir issue
Date Wed, 13 Jan 2016 17:03:06 GMT
fixing wrong remoteOutputDir issue


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

Branch: refs/heads/develop
Commit: 0b75afd8aa781fcef4ed723449a302526e9c8742
Parents: 51ba071
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Thu Jan 7 10:27:23 2016 -0500
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Thu Jan 7 10:27:23 2016 -0500

----------------------------------------------------------------------
 .../cpi/impl/SimpleOrchestratorImpl.java             | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/0b75afd8/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 fce6b84..ff515ef 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
@@ -555,20 +555,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
             ComputeResourcePreference computeResourcePreference = OrchestratorUtils.getComputeResourcePreference(orchestratorContext,
processModel, gatewayId);
             ComputeResourceDescription computeResource = orchestratorContext.getRegistry().getAppCatalog().getComputeResource().getComputeResource(processModel.getComputeResourceId());
 
-            String experimentDataDir = processModel.getExperimentDataDir();
-            String remoteOutputDir;
-            if(experimentDataDir != null && !experimentDataDir.isEmpty()) {
-                if(experimentDataDir.startsWith(File.separator)){
-                    experimentDataDir = experimentDataDir.substring(1);
-                }
-                if(!experimentDataDir.endsWith(File.separator)){
-                    experimentDataDir += File.separator;
-                }
-                remoteOutputDir = computeResourcePreference.getScratchLocation() + File.separator
+
-                        experimentDataDir + processModel.getProcessId();
-            } else {
-                remoteOutputDir = computeResourcePreference.getScratchLocation() + File.separator
+ processModel.getProcessId();
-            }
+            String remoteOutputDir = computeResourcePreference.getScratchLocation() + File.separator
+ processModel.getProcessId();
             remoteOutputDir = remoteOutputDir.endsWith("/") ? remoteOutputDir : remoteOutputDir
+ "/";
             DataStagingTaskModel submodel = new DataStagingTaskModel();
             submodel.setType(DataStageType.OUPUT);


Mime
View raw message