From b8c9959c938a492f934e5331c7fb33771cd6e15e Mon Sep 17 00:00:00 2001 From: liangzhiyan Date: Tue, 28 Aug 2018 15:24:05 +0800 Subject: [PATCH 1/2] remove disconnect --- src/main/java/org/tron/core/net/node/NodeImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/tron/core/net/node/NodeImpl.java b/src/main/java/org/tron/core/net/node/NodeImpl.java index 634a75ad6b8..03766aab843 100644 --- a/src/main/java/org/tron/core/net/node/NodeImpl.java +++ b/src/main/java/org/tron/core/net/node/NodeImpl.java @@ -733,13 +733,14 @@ private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) { processAdvBlock(peer, blkMsg.getBlockCapsule()); startFetchItem(); } - } else { - if (!syncFlag) {//not we request and not sync,disconnect - logger.error("not we request and not sync, disconnect : {}, block : {}", - peer.getInetAddress(), blockId.getString()); - banTraitorPeer(peer, ReasonCode.BAD_PROTOCOL); - } } +// else { +// if (!syncFlag) {//not we request and not sync,disconnect +// logger.error("not we request and not sync, disconnect : {}, block : {}", +// peer.getInetAddress(), blockId.getString()); +// banTraitorPeer(peer, ReasonCode.BAD_PROTOCOL); +// } +// } } From 4682e3db2454482a0e4c882d4c2907770d6cffc2 Mon Sep 17 00:00:00 2001 From: liangzhiyan Date: Tue, 28 Aug 2018 15:27:31 +0800 Subject: [PATCH 2/2] remove else --- src/main/java/org/tron/core/net/node/NodeImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/tron/core/net/node/NodeImpl.java b/src/main/java/org/tron/core/net/node/NodeImpl.java index 03766aab843..65d5032e51e 100644 --- a/src/main/java/org/tron/core/net/node/NodeImpl.java +++ b/src/main/java/org/tron/core/net/node/NodeImpl.java @@ -727,7 +727,8 @@ private void onHandleBlockMessage(PeerConnection peer, BlockMessage blkMsg) { isFetchSyncActive = true; } } - } else if (advObjWeRequested.containsKey(item)) { + } + if (advObjWeRequested.containsKey(item)) { advObjWeRequested.remove(item); if (!syncFlag) { processAdvBlock(peer, blkMsg.getBlockCapsule());