Merge pull request #431 from tronprotocol/p2p_msg_queue

modify P2pHandler and message queue
tronprotocol · Apr 13, 2018 · 0573941 · 0573941
2 parents c5b5452 + 5240b3f
commit 0573941
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/org/tron/common/overlay/server/MessageQueue.java b/src/main/java/org/tron/common/overlay/server/MessageQueue.java
@@ -173,7 +173,7 @@ private void sendToWire(MessageRoundtrip messageRoundtrip) {
 
     if (messageRoundtrip.getRetryTimes() > 0){
       logger.warn("send msg timeout. close channel {}.", ctx.channel().remoteAddress());
-      ctx.close();
+      close();
       return;
     }
 
@@ -193,6 +193,11 @@ private void sendToWire(MessageRoundtrip messageRoundtrip) {
 
   public void close() {
     sendMsgThread.interrupt();
-    timerTask.cancel(false);
+    timerTask.cancel(true);
+    if (ctx != null){
+      ctx.close();
+      ctx = null;
+    }
   }
+
 }
diff --git a/src/main/java/org/tron/common/overlay/server/P2pHandler.java b/src/main/java/org/tron/common/overlay/server/P2pHandler.java
@@ -100,7 +100,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
 
   public void closeChannel(ChannelHandlerContext ctx) {
     ctx.close();
-    pingTask.cancel(false);
+    pingTask.cancel(true);
     msgQueue.close();
   }