add InterruptedException for processSolidityBlock

Author: 317787106

framework/src/main/java/org/tron/program/SolidityNode.java

@@ -4,10 +4,12 @@
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
@@ -25,7 +27,7 @@
 import org.tron.protos.Protocol.Block;
 
 @Slf4j(topic = "app")
-@Conditional(value = {SolidityNode.SolidityCondition.class})
+@Conditional(SolidityNode.SolidityCondition.class)
 @Component
 public class SolidityNode {
 
@@ -109,8 +111,15 @@ private void getBlock() {
   private void processSolidityBlock() {
     while (flag) {
       try {
-        Block block = blockQueue.take();
+        Block block = blockQueue.poll(exceptionSleepTime, TimeUnit.MILLISECONDS);
+        if (block == null) {
+          continue;
+        }
         loopProcessBlock(block);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        logger.info("processSolidityBlock interrupted.");
+        return;
       } catch (Exception e) {
         logger.error(e.getMessage());
         sleep(exceptionSleepTime);
@@ -196,9 +205,11 @@ private void resolveCompatibilityIssueIfUsingFullNodeDatabase() {
   }
 
   static class SolidityCondition implements Condition {
+
     @Override
-    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+    public boolean matches(@NonNull ConditionContext context,
+        @NonNull AnnotatedTypeMetadata metadata) {
       return Args.getInstance().isSolidityNode();
     }
   }
-}
+}