Merge pull request tronprotocol#2285 from tronprotocol/sonar_repair

xxo1shine · web-flow · commit 1da7fbb20059 · 2019-06-05T11:43:25.000+08:00
Modify sonar problem
diff --git a/src/main/java/org/tron/common/overlay/server/FastForward.java b/src/main/java/org/tron/common/overlay/server/FastForward.java
@@ -26,8 +26,6 @@ public class FastForward {
   @Autowired
   private ApplicationContext ctx;
 
-  private WitnessScheduleStore witnessScheduleStore;
-
   private ChannelManager channelManager;
 
   private BackupManager backupManager;
@@ -49,9 +47,9 @@ public void init() {
       return;
     }
 
-    witnessScheduleStore = ctx.getBean(WitnessScheduleStore.class);
     channelManager = ctx.getBean(ChannelManager.class);
     backupManager = ctx.getBean(BackupManager.class);
+    WitnessScheduleStore witnessScheduleStore = ctx.getBean(WitnessScheduleStore.class);
 
     executorService.scheduleWithFixedDelay(() -> {
       try {
diff --git a/src/main/java/org/tron/common/overlay/server/P2pHandler.java b/src/main/java/org/tron/common/overlay/server/P2pHandler.java
@@ -33,13 +33,10 @@ public class P2pHandler extends SimpleChannelInboundHandler<P2pMessage> {
 
   private volatile boolean hasPing = false;
 
-  private volatile long sendPingTime;
-
   @Override
-  public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+  public void handlerAdded(ChannelHandlerContext ctx) {
     pingTask = pingTimer.scheduleAtFixedRate(() -> {
       if (!hasPing) {
-        sendPingTime = System.currentTimeMillis();
         hasPing = msgQueue.sendMessage(PING_MESSAGE);
       }
     }, 10, 10, TimeUnit.SECONDS);
diff --git a/src/main/java/org/tron/core/net/TronNetDelegate.java b/src/main/java/org/tron/core/net/TronNetDelegate.java
@@ -216,11 +216,8 @@ public void pushTransaction(TransactionCapsule trx) throws P2pException {
 
   public boolean validBlock(BlockCapsule block) throws P2pException {
     try {
-      if (!block.validateSignature(dbManager) ||
-          !witnessScheduleStore.getActiveWitnesses().contains(block.getWitnessAddress())) {
-        return false;
-      }
-      return true;
+      return witnessScheduleStore.getActiveWitnesses().contains(block.getWitnessAddress())
+          && block.validateSignature(dbManager);
     } catch (ValidateSignatureException e) {
       throw new P2pException(TypeEnum.BAD_BLOCK, e);
     }
