airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [14/51] [abbrv] airavata git commit: Code cleanup
Date Sun, 16 Oct 2016 22:25:56 GMT
Code cleanup


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

Branch: refs/heads/airavata-gov-registry
Commit: 1b91dd1ce35f2ed37ad93b9762fe227aa72ae913
Parents: 8f91bde
Author: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Authored: Wed Oct 12 13:47:00 2016 -0400
Committer: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Committed: Wed Oct 12 13:47:00 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/airavata/gfac/impl/HTTPUtils.java    | 7 +++++++
 .../orchestrator/cpi/impl/SimpleOrchestratorImpl.java         | 6 ++----
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/1b91dd1c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
new file mode 100644
index 0000000..cbf5adc
--- /dev/null
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
@@ -0,0 +1,7 @@
+package org.apache.airavata.gfac.impl;
+
+/**
+ * Created by Ajinkya on 10/10/16.
+ */
+public class HTTPUtils {
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/1b91dd1c/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 b14b5cd..dec9b2c 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
@@ -406,15 +406,13 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
                 DataType type = processOutput.getType();
                 switch (type) {
                     case STDOUT :
-                        if(null == processOutput.getValue() ||
-                                (null != processOutput.getValue() && processOutput.getValue().trim().isEmpty())){
+                        if(null == processOutput.getValue() || processOutput.getValue().trim().isEmpty()){
                             processOutput.setValue(appName + ".stdout");
                         }
                         createOutputDataSatagingTasks(processModel, gatewayId, dataStagingTaskIds,
processOutput);
                         break;
                     case STDERR:
-                        if(null == processOutput.getValue() ||
-                                (null != processOutput.getValue() && processOutput.getValue().trim().isEmpty())){
+                        if(null == processOutput.getValue() || processOutput.getValue().trim().isEmpty()){
                             processOutput.setValue(appName + ".stderr");
                         }
                         createOutputDataSatagingTasks(processModel, gatewayId, dataStagingTaskIds,
processOutput);


Mime
View raw message