Merge pull request #355 from tronprotocol/fixCircularRef

Fix circular ref

Author: olenheim

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -30,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.client.PeerClient;
 import org.tron.common.overlay.discover.Node;
@@ -52,6 +53,8 @@ public class SyncPool {
   private NodeManager nodeManager;
 
   @Autowired
+  private ApplicationContext ctx;
+
   private ChannelManager channelManager;
 
   private PeerConnectionDelegate peerDel;
@@ -70,10 +73,11 @@ public class SyncPool {
   public SyncPool(PeerConnectionDelegate peerDel, PeerClient peerClient) {
     this.peerDel = peerDel;
     this.peerClient = peerClient;
-    init();
   }
 
   public void init() {
+    channelManager = ctx.getBean(ChannelManager.class);
+
     poolLoopExecutor.scheduleWithFixedDelay(() -> {
       try {
         fillUp();

src/main/java/org/tron/core/net/node/NodeDelegateImpl.java

@@ -1,6 +1,7 @@
 package org.tron.core.net.node;
 
 import com.google.common.primitives.Longs;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.LinkedList;
@@ -129,9 +130,10 @@ public LinkedList<BlockId> getLostBlockIds(List<BlockId> blockChainSummary)
   }
 
   @Override
-  public Deque<BlockId> getBlockChainSummary(BlockId beginBLockId, Deque<BlockId> blockIds) {
+  public Deque<BlockId> getBlockChainSummary(BlockId beginBLockId, Deque<BlockId> blockIdsToFetch) {
 
     Deque<BlockId> retSummary = new LinkedList<>();
+    List<BlockId> blockIds = new ArrayList<>(blockIdsToFetch);
     long highBlkNum;
     long highNoForkBlkNum;
     long lowBlkNum = 0;
@@ -166,7 +168,7 @@ public Deque<BlockId> getBlockChainSummary(BlockId beginBLockId, Deque<BlockId>
       } else if (lowBlkNum <= highBlkNum) {
         retSummary.offer(forkList.get((int) (lowBlkNum - highNoForkBlkNum - 1)));
       } else {
-        retSummary.offer(blockIds.poll());
+        retSummary.offer(blockIds.get((int) (lowBlkNum - highBlkNum - 1)));
       }
       lowBlkNum += (realHighBlkNum - lowBlkNum + 2) / 2;
     } while (lowBlkNum <= realHighBlkNum);

src/main/java/org/tron/core/net/node/NodeImpl.java

@@ -227,6 +227,7 @@ public void broadcast(Message msg) {
 
   @Override
   public void listen() {
+    pool.init();
     isAdvertiseActive = true;
     isFetchActive = true;
     isHandleSyncBlockActive = true;
@@ -557,7 +558,7 @@ private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) {
       //processSyncBlock(blkMsg.getBlockCapsule());
       if (!peer.isBusy()) {
         if (peer.getUnfetchSyncNum() > 0
-            && peer.getSyncBlockToFetch().size() < NodeConstant.SYNC_FETCH_BATCH_NUM) {
+            && peer.getSyncBlockToFetch().size() <= NodeConstant.SYNC_FETCH_BATCH_NUM) {
           syncNextBatchChainIds(peer);
         } else {
           //TODO: here should be a loop do this thing