fix getYamlOption with null

polardb · Sep 7, 2022 · e62c052 · e62c052
1 parent def5136
commit e62c052
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/batch-tool/src/main/java/cmd/FlagOption.java b/batch-tool/src/main/java/cmd/FlagOption.java
@@ -21,7 +21,7 @@ public class FlagOption extends ConfigArgOption {
 
     public Boolean defaultValue = null;
 
-    private FlagOption(String argShort, String argLong, String desc, String argName, boolean defaultValue) {
+    private FlagOption(String argShort, String argLong, String desc, String argName, Boolean defaultValue) {
         super(argShort, argLong, desc, argName);
         this.defaultValue = defaultValue;
     }

diff --git a/batch-tool/src/main/java/cmd/YamlConfigResult.java b/batch-tool/src/main/java/cmd/YamlConfigResult.java
@@ -58,11 +58,12 @@ public String getOptionValue(ConfigArgOption option) {
 
     private String getYamlOption(ConfigArgOption option) {
         String result = null;
-        if (argMap.containsKey(option.argShort)) {
-            result = String.valueOf(argMap.get(option.argShort));
+        Object o;
+        if ((o = argMap.get(option.argShort)) != null) {
+            result = String.valueOf(o);
         }
-        if (argMap.containsKey(option.argLong)) {
-            result = String.valueOf(argMap.get(option.argLong));
+        if ((o = argMap.get(option.argLong)) != null) {
+            result = String.valueOf(o);
         }
         return result;
     }

diff --git a/batch-tool/src/main/java/model/config/BaseConfig.java b/batch-tool/src/main/java/model/config/BaseConfig.java
@@ -66,7 +66,7 @@ int bitCount() {
     /**
      * 第一行是否为字段名
      */
-    protected boolean isWithHeader = ConfigConstant.DEFAULT_WITH_HEADER;
+    protected boolean isWithHeader;
 
     protected boolean shardingEnabled;