[incubator-iotdb] branch update_license updated: close inputstream

[qiaojialin]

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

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


The following commit(s) were added to refs/heads/update_license by this push:
     new 9563833  close inputstream
9563833 is described below

commit 9563833f460043749e02f6e6a40906a3330bfc7f
Author: qiaojialin <646274...@qq.com>
AuthorDate: Thu Mar 14 11:22:18 2019 +0800

    close inputstream
---
 tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java  | 7 ++++---
 .../iotdb/tsfile/write/schema/converter/JsonConverterTest.java     | 6 ++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java 
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
index 010e8d9..e5d0fbe 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
@@ -100,9 +100,10 @@ public class WriteTest {
 
     JSONObject emptySchema = JSON.parseObject("{\"delta_type\": 
\"test_type\",\"properties\": {\n"
         + "\"key1\": \"value1\",\n" + "\"key2\": \"value2\"\n" + 
"},\"schema\": [],}");
-    InputStream inputStream = new FileInputStream(schemaFile);
-    String jsonStr = IOUtils.toString(inputStream, "utf8");
-    measurementArray = 
JSON.parseObject(jsonStr).getJSONArray(JsonFormatConstant.JSON_SCHEMA);
+    try (InputStream inputStream = new FileInputStream(schemaFile)){
+      String jsonStr = IOUtils.toString(inputStream, "utf8");
+      measurementArray = 
JSON.parseObject(jsonStr).getJSONArray(JsonFormatConstant.JSON_SCHEMA);
+    }
     schema = new FileSchema(emptySchema);
     LOG.info(schema.toString());
     tsFileWriter = new TsFileWriter(file, schema, conf);
diff --git 
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
 
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
index 5325e41..4d0ad73 100755
--- 
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
+++ 
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
@@ -49,8 +49,7 @@ public class JsonConverterTest {
   public void testJsonConverter() throws WriteProcessException {
     String path = "src/test/resources/test_schema.json";
     JSONObject obj = null;
-    try {
-      InputStream inputStream = new FileInputStream(path);
+    try (InputStream inputStream = new FileInputStream(path)) {
       String jsonStr = IOUtils.toString(inputStream, "utf8");
       obj = JSON.parseObject(jsonStr);
     } catch (JSONException | IOException e) {
@@ -76,8 +75,7 @@ public class JsonConverterTest {
   public void testConvertInJsonAndFileSchema() throws 
InvalidJsonSchemaException {
     String path = "src/test/resources/test_schema.json";
     JSONObject srcObj = null;
-    try {
-      InputStream inputStream = new FileInputStream(path);
+    try (InputStream inputStream = new FileInputStream(path)){
       String jsonStr = IOUtils.toString(inputStream, "utf8");
       srcObj = JSON.parseObject(jsonStr);
     } catch (JSONException | IOException e) {