Merge remote-tracking branch 'origin/master'

liujie

9 天以前 7342170db7dc39326698d39b74e1858502fd574a

 MessagePushTravel/src/main/java/com/sinata/push/util/echo/DiscardServerHandler.java

@@ -104,7 +104,7 @@
//         System.err.println(insocket.getAddress() + ": Disconnect connection......");
      }
      NettyChannelMap.remove(ctx);
      System.err.println("清除通道" + ctx);
//      System.err.println("清除通道" + ctx);
//      super.channelInactive(ctx);
   }