[incubator-iotdb] branch master updated: fix config check

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new f0aecdb  fix config check
f0aecdb is described below

commit f0aecdb677e508628de42e6226616b69c57de414
Author: qiaojialin <646274...@qq.com>
AuthorDate: Fri May 29 21:30:25 2020 +0800

    fix config check
---
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java 
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
index a665d37..f61bd6b 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
@@ -221,7 +221,11 @@ public class IoTDBConfigCheck {
     }
 
     try (FileOutputStream tmpFOS = new 
FileOutputStream(tmpPropertiesFile.toString())) {
-      systemProperties.forEach((k, v) -> properties.setProperty(k, v));
+      systemProperties.forEach((k, v) -> {
+        if (!properties.containsKey(k)) {
+          properties.setProperty(k, v);
+        }
+      });
 
       properties.store(tmpFOS, SYSTEM_PROPERTIES_STRING);
       // upgrade finished, delete old system.properties file