Merge pull request #3765 from actiontech/fix/2283

fix[inner-2283]: heartbeat_keep_alive add null value judgment
actiontech · Jul 10, 2023 · a84c09c · a84c09c
2 parents c24b919 + 7daa185
commit a84c09c
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/main/java/com/actiontech/dble/services/manager/information/tables/DbleDbGroup.java b/src/main/java/com/actiontech/dble/services/manager/information/tables/DbleDbGroup.java
@@ -289,30 +289,30 @@ private void checkRule(LinkedHashMap<String, String> row) {
                     }
                 }
             }
-            String delayThresholdStr = row.get(COLUMN_DELAY_THRESHOLD);
-            String heartbeatTimeoutStr = row.get(COLUMN_HEARTBEAT_TIMEOUT);
-            String heartbeatRetryStr = row.get(COLUMN_HEARTBEAT_RETRY);
-            if (StringUtil.isBlank(delayThresholdStr) || IntegerUtil.parseInt(delayThresholdStr) < -1) {
-                throw new ConfigException("Column '" + COLUMN_DELAY_THRESHOLD + "' should be an integer greater than or equal to -1!");
-            }
-            if (StringUtil.isBlank(heartbeatTimeoutStr) || IntegerUtil.parseInt(heartbeatTimeoutStr) < 0) {
-                throw new ConfigException("Column '" + COLUMN_HEARTBEAT_TIMEOUT + "' should be an integer greater than or equal to 0!");
-            }
-            if (StringUtil.isBlank(heartbeatRetryStr) || IntegerUtil.parseInt(heartbeatRetryStr) < 0) {
-                throw new ConfigException("Column '" + COLUMN_HEARTBEAT_RETRY + "' should be an integer greater than or equal to 0!");
-            }
-            String heartbeatKeepAliveStr = row.get(COLUMN_KEEP_ALIVE);
-            if (!StringUtil.isBlank(heartbeatKeepAliveStr) && IntegerUtil.parseInt(heartbeatKeepAliveStr) < 0) {
-                throw new ConfigException("Column '" + COLUMN_KEEP_ALIVE + "' should be an integer greater than or equal to 0!");
-            }
-            String delayPeriodMillis = row.get(DELAY_PERIOD_MILLIS);
-            delayDetectionCheck(delayPeriodMillis);
+            checkInterValue(row);
         }
     }
 
-    private void delayDetectionCheck(String delayPeriodMillis) {
-        if (!StringUtil.isBlank(delayPeriodMillis) && IntegerUtil.parseInt(delayPeriodMillis) < -1) {
-            throw new ConfigException("Column '" + COLUMN_DELAY_THRESHOLD + "' should be an integer greater than -1!");
+    private void checkInterValue(LinkedHashMap<String, String> row) {
+        String delayThresholdStr = row.get(COLUMN_DELAY_THRESHOLD);
+        String heartbeatTimeoutStr = row.get(COLUMN_HEARTBEAT_TIMEOUT);
+        String heartbeatRetryStr = row.get(COLUMN_HEARTBEAT_RETRY);
+        if (row.containsKey(COLUMN_DELAY_THRESHOLD) && (StringUtil.isBlank(delayThresholdStr) || IntegerUtil.parseInt(delayThresholdStr) < -1)) {
+            throw new ConfigException("Column '" + COLUMN_DELAY_THRESHOLD + "' should be an integer greater than or equal to -1!");
+        }
+        if (row.containsKey(COLUMN_HEARTBEAT_TIMEOUT) && (StringUtil.isBlank(heartbeatTimeoutStr) || IntegerUtil.parseInt(heartbeatTimeoutStr) < 0)) {
+            throw new ConfigException("Column '" + COLUMN_HEARTBEAT_TIMEOUT + "' should be an integer greater than or equal to 0!");
+        }
+        if (row.containsKey(COLUMN_HEARTBEAT_RETRY) && (StringUtil.isBlank(heartbeatRetryStr) || IntegerUtil.parseInt(heartbeatRetryStr) < 0)) {
+            throw new ConfigException("Column '" + COLUMN_HEARTBEAT_RETRY + "' should be an integer greater than or equal to 0!");
+        }
+        String heartbeatKeepAliveStr = row.get(COLUMN_KEEP_ALIVE);
+        if (row.containsKey(COLUMN_KEEP_ALIVE) && (StringUtil.isBlank(heartbeatKeepAliveStr) || IntegerUtil.parseInt(heartbeatKeepAliveStr) < 0)) {
+            throw new ConfigException("Column '" + COLUMN_KEEP_ALIVE + "' should be an integer greater than or equal to 0!");
+        }
+        String delayPeriodMillis = row.get(DELAY_PERIOD_MILLIS);
+        if (row.containsKey(DELAY_PERIOD_MILLIS) && (StringUtil.isBlank(delayPeriodMillis) || IntegerUtil.parseInt(delayPeriodMillis) < -1)) {
+            throw new ConfigException("Column '" + DELAY_PERIOD_MILLIS + "' should be an integer greater than or equal to -1!");
         }
     }