delete process handle success

shydesky · shydesky · commit 5a51e4927cbc · 2018-08-28T11:38:47.000+08:00
diff --git a/src/main/java/org/tron/core/net/node/AdvBlockDisorder.java b/src/main/java/org/tron/core/net/node/AdvBlockDisorder.java
@@ -14,12 +14,10 @@
  * @description: This class is for Mapping Util using.
  * The member variable map is used for store the block's parent hash(key)
  * and the PeerAndBlockCapsule(value).
- * When we handle a block unsuccessfully because of UnLinkedBlockException, we
- * add the parent hash and the PeerAndBlockCapsule to the map.
- * When we handle a block successfully,we can search whether his child block
- * exists in the map, and we can handle this child simultaneously.
- * @author: shydesky@gmail.com
- * @create: 2018-07-13
+ * When we receive a disordered block, we
+ * add the (parent hash, PeerAndBlockCapsule) to the map.
+ * When we receive a ordered block and handle it, if success, we can search whether his child block
+ * exists in the map, and we can handle this child simultaneously, if failure, we remove the his child block
  **/
 public class AdvBlockDisorder {
     private HashMap<Sha256Hash, PeerAndBlockCapsule> map;
diff --git a/src/main/java/org/tron/core/net/node/NodeImpl.java b/src/main/java/org/tron/core/net/node/NodeImpl.java
@@ -759,20 +759,14 @@ private void processAdvBlock(PeerConnection peer, BlockCapsule block) {
     }else{
       // receive an ordered block we have requested, try to push block
       advObjWeRequested.remove(block.getBlockId());
-      boolean isSuccess = true;
-      while (isSuccess) {
-        isSuccess = realProcessAdvBlock(peer, block);
-        if (isSuccess) {
-          // if push block success, we try to find his child block and continue push
-          AdvBlockDisorder.PeerAndBlockCapsule blockAndPeer = advBlockDisorder.getNextBlockAndRemove(block);
-          if(blockAndPeer == null){
-            break;
-          }
-          block = blockAndPeer.getBlockCapsule();
-          peer = blockAndPeer.getPeer();
-        }else{
-          advBlockDisorder.remove(block);
+      while (realProcessAdvBlock(peer, block)) {
+        // if push block success, we try to find his child block and continue push
+        AdvBlockDisorder.PeerAndBlockCapsule blockAndPeer = advBlockDisorder.getNextBlockAndRemove(block);
+        if(blockAndPeer == null){
+          break;
         }
+        block = blockAndPeer.getBlockCapsule();
+        peer = blockAndPeer.getPeer();
       }
     }
   }
