From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 4 Apr 2019 08:51:11 +0000 (+0200)
Subject: [sonar] Simplify nested try blocks.
X-Git-Tag: v3.22.2~181
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b1db6c86d4b421de12d0bdd1d635b158f46b97c7

[sonar] Simplify nested try blocks.
---

diff --git a/examples/deprecated/java/dht/chord/Node.java b/examples/deprecated/java/dht/chord/Node.java
index a9a9511af2..e201df9567 100644
--- a/examples/deprecated/java/dht/chord/Node.java
+++ b/examples/deprecated/java/dht/chord/Node.java
@@ -186,29 +186,26 @@ public class Node extends Process {
     GetPredecessorTask sendTask = new GetPredecessorTask(getHost().getName(), this.mailbox);
     try {
       sendTask.send(mailboxTo, Common.TIMEOUT);
-      try {
-        do {
-          if (commReceive == null) {
-            commReceive = Task.irecv(this.mailbox);
-          }
-          commReceive.waitCompletion(Common.TIMEOUT);
-          Task taskReceived = commReceive.getTask();
-          if (taskReceived instanceof GetPredecessorAnswerTask) {
-            predecessorId = ((GetPredecessorAnswerTask) taskReceived).getAnswerId();
-            stop = true;
-          } else {
-            handleTask(taskReceived);
-          }
-          commReceive = null;
-        } while (!stop);
-      }
-      catch (MsgException e) {
+      do {
+        if (commReceive == null) {
+          commReceive = Task.irecv(this.mailbox);
+        }
+        commReceive.waitCompletion(Common.TIMEOUT);
+        Task taskReceived = commReceive.getTask();
+        if (taskReceived instanceof GetPredecessorAnswerTask) {
+          predecessorId = ((GetPredecessorAnswerTask) taskReceived).getAnswerId();
+          stop = true;
+        } else {
+          handleTask(taskReceived);
+        }
         commReceive = null;
-      }
+      } while (!stop);
     }
     catch (MsgException e) {
       Msg.debug("Failed to send the Get Predecessor request");
     }
+    commReceive = null;
+
     return predecessorId;
   }
 
@@ -240,23 +237,17 @@ public class Node extends Process {
         if (commReceive == null) {
           commReceive = Task.irecv(this.mailbox);
         }
-        try {
-          commReceive.waitCompletion(Common.TIMEOUT);
-          Task task = commReceive.getTask();
-          if (task instanceof FindSuccessorAnswerTask) {
-            //TODO: Check if this this our answer.
-            FindSuccessorAnswerTask fTask = (FindSuccessorAnswerTask) task;
-            stop = true;
-            successor = fTask.getAnswerId();
-          } else {
-            handleTask(task);
-          }
-          commReceive = null;
-        }
-        catch (TimeoutException e) {
+        commReceive.waitCompletion(Common.TIMEOUT);
+        Task task = commReceive.getTask();
+        if (task instanceof FindSuccessorAnswerTask) {
+          //TODO: Check if this this our answer.
+          FindSuccessorAnswerTask fTask = (FindSuccessorAnswerTask) task;
           stop = true;
-          commReceive = null;
+          successor = fTask.getAnswerId();
+        } else {
+          handleTask(task);
         }
+        commReceive = null;
       } while (!stop);
     }
     catch (TimeoutException e) {
@@ -265,6 +256,7 @@ public class Node extends Process {
     catch (MsgException e) {
       Msg.debug("Failed to receive Find Successor");
     }
+    commReceive = null;
 
     return successor;
   }