Merge pull request #181 from iExecBlockchainComputing/patch

Fix NPE problem when requesting replicates

Author: zguesmi

src/main/java/com/iexec/worker/feign/CustomFeignClient.java

@@ -17,6 +17,7 @@
 import org.springframework.stereotype.Service;
 import org.web3j.crypto.ECKeyPair;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -107,19 +108,21 @@ public void registerWorker(WorkerConfigurationModel model) {
     }
 
     public List<InterruptedReplicateModel> getInterruptedReplicates(long lastAvailableBlockNumber) {
+        List<InterruptedReplicateModel> interruptedReplicates = new ArrayList<>();
+
         try {
-            return replicateClient.getInterruptedReplicates(lastAvailableBlockNumber, getToken());
+            interruptedReplicates = replicateClient.getInterruptedReplicates(lastAvailableBlockNumber, getToken());
         } catch (FeignException e) {
-            if (e.status() == 0) {
-                log.error("Failed to getInterruptedReplicates, will retry [instance:{}]", coreURL);
-                sleep();
-                return getInterruptedReplicates(lastAvailableBlockNumber);
-            } else if (HttpStatus.valueOf(e.status()).equals(HttpStatus.UNAUTHORIZED)) {
+            if (e.status() == HttpStatus.UNAUTHORIZED.value()) {
                 generateNewToken();
-                return getInterruptedReplicates(lastAvailableBlockNumber);
+                interruptedReplicates = replicateClient.getInterruptedReplicates(lastAvailableBlockNumber, getToken());
+            } else {
+                log.error("Failed to get interrupted replicates [instance:{}]", coreURL);
+                e.printStackTrace();
             }
         }
-        return null;
+
+        return interruptedReplicates;
     }
 
     public List<String> getTasksInProgress() {
@@ -139,17 +142,21 @@ public List<String> getTasksInProgress() {
     }
 
     public Optional<ContributionAuthorization> getAvailableReplicate(long lastAvailableBlockNumber) {
+        ContributionAuthorization contributionAuth = null;
+
         try {
-            return Optional.ofNullable(replicateClient.getAvailableReplicate(lastAvailableBlockNumber, getToken()));
+            contributionAuth = replicateClient.getAvailableReplicate(lastAvailableBlockNumber, getToken());
         } catch (FeignException e) {
-            if (e.status() == 0) {
-                log.error("Failed to getAvailableReplicate [instance:{}]", coreURL);
-            } else if (HttpStatus.valueOf(e.status()).equals(HttpStatus.UNAUTHORIZED)) {
+            if (e.status() == HttpStatus.UNAUTHORIZED.value()) {
                 generateNewToken();
-                return Optional.of(replicateClient.getAvailableReplicate(lastAvailableBlockNumber, getToken()));
+                contributionAuth = replicateClient.getAvailableReplicate(lastAvailableBlockNumber, getToken());
+            } else {
+                log.error("Failed to get an available replicate [instance:{}]", coreURL);
+                e.printStackTrace();
             }
         }
-        return Optional.empty();
+
+        return contributionAuth == null ? Optional.empty() : Optional.of(contributionAuth);
     }
 
     public void updateReplicateStatus(String chainTaskId, ReplicateStatus status) {