Add requested changes

iExecBlockchainComputing · May 17, 2021 · e73ec20 · e73ec20
1 parent e7ead64
commit e73ec20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/iexec/common/task/TaskDescription.java b/src/main/java/com/iexec/common/task/TaskDescription.java
@@ -73,6 +73,7 @@ public class TaskDescription {
      */
     public boolean containsDataset() {
         return !StringUtils.isEmpty(datasetAddress) &&
+                !datasetAddress.equals(BytesUtils.EMPTY_ADDRESS) &&
                 !StringUtils.isEmpty(datasetUri) &&
                 !StringUtils.isEmpty(datasetChecksum) &&
                 !StringUtils.isEmpty(datasetName);
@@ -84,7 +85,7 @@ public boolean containsDataset() {
      * @return true if a callback address is found in the deal, false otherwise.
      */
     public boolean containsCallback() {
-        return getCallback() != null &&
+        return StringUtils.isEmpty(getCallback()) &&
                 !getCallback().equals(BytesUtils.EMPTY_ADDRESS);
     }
 

diff --git a/src/main/java/com/iexec/common/utils/IexecEnvUtils.java b/src/main/java/com/iexec/common/utils/IexecEnvUtils.java
@@ -64,19 +64,19 @@ private IexecEnvUtils() {
      * @return
      */
     public static Map<String, String> getAllIexecEnv(TaskDescription taskDescription) {
-        Map<String, String> map = new HashMap<>();
-        map.putAll(getComputeStageEnvMap(taskDescription));
-        map.put(IEXEC_DATASET_URL, taskDescription.getDatasetUri());
-        map.put(IEXEC_DATASET_CHECKSUM, taskDescription.getDatasetChecksum());
+        Map<String, String> envMap = new HashMap<>();
+        envMap.putAll(getComputeStageEnvMap(taskDescription));
+        envMap.put(IEXEC_DATASET_URL, taskDescription.getDatasetUri());
+        envMap.put(IEXEC_DATASET_CHECKSUM, taskDescription.getDatasetChecksum());
         if (taskDescription.getInputFiles() == null) {
-            return map;
+            return envMap;
         }
         int index = 1;
         for (String inputFileUrl : taskDescription.getInputFiles()) {
-            map.put(IEXEC_INPUT_FILE_URL_PREFIX + index, inputFileUrl);
+            envMap.put(IEXEC_INPUT_FILE_URL_PREFIX + index, inputFileUrl);
             index++;
         }
-        return map;
+        return envMap;
     }
 
     /**