You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/07/13 13:22:38 UTC
[incubator-iotdb] branch fix_tmpProperties_0_10 created (now
1236844)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch fix_tmpProperties_0_10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 1236844 fix check properties
This branch includes the following new commits:
new ba33dd7 Merge branch 'rel/0.10' of https://github.com/apache/incubator-iotdb into fix_tmpProperties_0_10
new 1236844 fix check properties
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/02: Merge branch 'rel/0.10' of
https://github.com/apache/incubator-iotdb into fix_tmpProperties_0_10
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_tmpProperties_0_10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ba33dd7ba3b87e0ff24200c19b62783772956bbd
Merge: 25b6642 53dacaf
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Jul 13 21:20:32 2020 +0800
Merge branch 'rel/0.10' of https://github.com/apache/incubator-iotdb into fix_tmpProperties_0_10
[incubator-iotdb] 02/02: fix check properties
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch fix_tmpProperties_0_10
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1236844db77f2a1c4cf34c153c4ed423ec57bb31
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Jul 13 21:22:09 2020 +0800
fix check properties
---
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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 c40fb43..b1e1201 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
@@ -177,8 +177,10 @@ public class IoTDBConfigCheck {
}
// no tmp file, read properties from system.properties
- try (FileInputStream inputStream = new FileInputStream(propertiesFile)) {
- properties.load(new InputStreamReader(inputStream, TSFileConfig.STRING_CHARSET));
+ try (FileInputStream inputStream = new FileInputStream(propertiesFile);
+ InputStreamReader inputStreamReader = new InputStreamReader(
+ inputStream, TSFileConfig.STRING_CHARSET)) {
+ properties.load(inputStreamReader);
}
// need to upgrade from 0.9 to 0.10
if (!properties.containsKey(IOTDB_VERSION_STRING)) {