fix thread interupt.

Author: zhaohong

src/main/java/org/tron/core/net/message/BlockMessage.java

@@ -1,5 +1,6 @@
 package org.tron.core.net.message;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.BlockCapsule.BlockId;
@@ -10,7 +11,7 @@ public class BlockMessage extends TronMessage {
 
   private Block block;
 
-  public BlockMessage(byte[] data) throws Exception {
+  public BlockMessage(byte[] data) throws InvalidProtocolBufferException {
     this.type = MessageTypes.BLOCK.asByte();
     this.data = data;
     this.block = Protocol.Block.parseFrom(data);
@@ -22,7 +23,7 @@ public BlockMessage(Block block) {
     this.data = block.toByteArray();
   }
 
-  public BlockMessage(BlockCapsule block) throws Exception {
+  public BlockMessage(BlockCapsule block) {
     data = block.getData();
     this.type = MessageTypes.BLOCK.asByte();
     this.block = block.getInstance();

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

@@ -18,7 +18,7 @@
 public interface NodeDelegate {
 
   LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boolean syncMode)
-      throws BadBlockException, UnLinkedBlockException;
+      throws BadBlockException, UnLinkedBlockException, InterruptedException;
 
   void handleTransaction(TransactionCapsule trx) throws BadTransactionException;
 

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

@@ -49,7 +49,7 @@ public NodeDelegateImpl(Manager dbManager) {
 
   @Override
   public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boolean syncMode)
-      throws BadBlockException, UnLinkedBlockException {
+      throws BadBlockException, UnLinkedBlockException, InterruptedException {
 
     if (block.getInstance().getSerializedSize() > BLOCK_SIZE + 100) {
       throw new BadBlockException("block size over limit");
@@ -83,8 +83,6 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
       throw new BadBlockException("ContractValidate exception," + e.getMessage());
     } catch (ContractExeException e) {
       throw new BadBlockException("Contract Exectute exception," + e.getMessage());
-    } catch (InterruptedException e) {
-      throw new BadBlockException("pre validate signature exception," + e.getMessage());
     } catch (TaposException e) {
       throw new BadBlockException("tapos exception," + e.getMessage());
     } catch (DupTransactionException e) {

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

@@ -764,8 +764,8 @@ private void processAdvBlock(PeerConnection peer, BlockCapsule block) {
     //TODO: lack the complete flow.
     if (!freshBlockId.contains(block.getBlockId())) {
       try {
-        LinkedList<Sha256Hash> trxIds = del.handleBlock(block, false);
-
+        LinkedList<Sha256Hash> trxIds = null;
+        trxIds = del.handleBlock(block, false);
         freshBlockId.offer(block.getBlockId());
 
         trxIds.forEach(trxId -> advObjToFetch.remove(trxId));
@@ -786,18 +786,25 @@ private void processAdvBlock(PeerConnection peer, BlockCapsule block) {
             block.getBlockId().getString(), peer.getNode().getHost(),
             del.getHeadBlockId().getString());
         startSyncWithPeer(peer);
-      } catch (Exception e) {
-        logger.error("Fail to process adv block {} from {}", block.getBlockId().getString(),
-            peer.getNode().getHost(), e);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
       }
+
+      // logger.error("Fail to process adv block {} from {}", block.getBlockId().getString(),
+      // peer.getNode().getHost(), e);
+
     }
   }
 
   private boolean processSyncBlock(BlockCapsule block) {
     boolean isAccept = false;
     ReasonCode reason = null;
     try {
-      del.handleBlock(block, true);
+      try {
+        del.handleBlock(block, true);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
       freshBlockId.offer(block.getBlockId());
       logger.info("Success handle block {}", block.getBlockId().getString());
       isAccept = true;