fix bug: fix compliant in Jenkins scan (#541)

WeBankBlockchain · Mar 20, 2020 · 3b53285 · 3b53285
1 parent f3944e7
commit 3b53285
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/weevent-governance/src/main/java/com/webank/weevent/governance/initial/InitialDb.java b/weevent-governance/src/main/java/com/webank/weevent/governance/initial/InitialDb.java
@@ -120,6 +120,6 @@ private void runScript(String defaultUrl, Boolean flag, List<String> tableSqlLis
 
     @Override
     public void close() throws Exception {
-        log.error("resource is close");
+        log.info("resource is close");
     }
 }
diff --git a/weevent-processor/src/main/java/com/webank/weevent/processor/mq/CEPRuleMQ.java b/weevent-processor/src/main/java/com/webank/weevent/processor/mq/CEPRuleMQ.java
@@ -435,9 +435,10 @@ public static StatisticWeEvent getStatisticWeEvent() {
     }
 
     private static class DBThread implements Runnable {
+        private volatile boolean flag = false;
 
         public void run() {
-            while (true) {
+            while (!flag) {
                 try {
                     // if the quene is null,then the thread sleep 1s
                     long ideaTime = 1000L;
@@ -453,9 +454,9 @@ public void run() {
                         }
                     }
                 } catch (InterruptedException e) {
-                    log.info("insert is fail,{}", e.toString());
+                    log.info("insert  fail,{}", e.toString());
                     Thread.currentThread().interrupt();
-                    break;
+                    flag = true;
                 }
             }
         }

diff --git a/weevent-processor/src/main/java/com/webank/weevent/processor/utils/CommonUtil.java b/weevent-processor/src/main/java/com/webank/weevent/processor/utils/CommonUtil.java
@@ -5,6 +5,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -135,20 +136,11 @@ public static List<String> getKeys(String objJson) {
         try {
             Map<String, Object> map = JsonHelper.json2Object(objJson, new TypeReference<Map<String, Object>>() {
             });
-
-            if (JsonHelper.isValid(objJson)) {
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    keys.add(entry.getKey());
-                }
-            } else {
-                keys = null;
-            }
-
+            return Arrays.asList(map.keySet().toArray(new String[]{}));
         } catch (Exception e) {
-            keys = null;
-            log.info("json get key error");
+            log.info("json get key error", e);
+            return Collections.emptyList();
         }
-        return keys;
     }
 
     public static boolean checkJson(String content, String objJson) {