(inlong) branch master updated: [INLONG-9760][Manager] Make sure BufferedReader close properly (#9761)

[dockerzhang]

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

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 408baab999 [INLONG-9760][Manager] Make sure BufferedReader close 
properly (#9761)
408baab999 is described below

commit 408baab9998d5054d746f95c8f21b03a04beafd7
Author: AloysZhang <aloyszh...@apache.org>
AuthorDate: Fri Mar 1 15:27:03 2024 +0800

    [INLONG-9760][Manager] Make sure BufferedReader close properly (#9761)
---
 .../apache/inlong/manager/plugin/util/FlinkConfiguration.java  |  5 +++--
 .../service/maintenanceTools/MaintenanceToolsServiceImpl.java  | 10 ++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
 
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
index cc84a652b8..d5f3d8ed6e 100644
--- 
a/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
+++ 
b/inlong-manager/manager-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
@@ -95,8 +95,9 @@ public class FlinkConfiguration {
      */
     private FlinkConfig getFlinkConfigFromFile(String fileName) throws 
IOException {
         Properties properties = new Properties();
-        BufferedReader bufferedReader = new BufferedReader(new 
FileReader(fileName));
-        properties.load(bufferedReader);
+        try (BufferedReader bufferedReader = new BufferedReader(new 
FileReader(fileName))) {
+            properties.load(bufferedReader);
+        }
         FlinkConfig flinkConfig = new FlinkConfig();
         flinkConfig.setPort(Integer.valueOf(properties.getProperty(PORT)));
         flinkConfig.setAddress(properties.getProperty(ADDRESS));
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/maintenanceTools/MaintenanceToolsServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/maintenanceTools/MaintenanceToolsServiceImpl.java
index 45ec326e5c..5d17ea9031 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/maintenanceTools/MaintenanceToolsServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/maintenanceTools/MaintenanceToolsServiceImpl.java
@@ -66,8 +66,8 @@ public class MaintenanceToolsServiceImpl implements 
MaintenanceToolsService {
     public List<SortConsumerInfo> getSortConsumer(MultipartFile file) {
         
LoginUserUtils.getLoginUser().getRoles().add(UserRoleCode.INLONG_SERVICE);
         List<SortConsumerInfo> sortConsumerInfoList = new ArrayList<>();
-        try (InputStreamReader read = new 
InputStreamReader((file.getInputStream()), StandardCharsets.UTF_8)) {
-            BufferedReader bufferedReader = new BufferedReader(read);
+        try (BufferedReader bufferedReader =
+                new BufferedReader(new 
InputStreamReader((file.getInputStream()), StandardCharsets.UTF_8))) {
             String readerStr = null;
             while ((readerStr = bufferedReader.readLine()) != null) {
                 String[] sinkIdList = readerStr.split(InlongConstants.COMMA);
@@ -91,7 +91,6 @@ public class MaintenanceToolsServiceImpl implements 
MaintenanceToolsService {
                     sortConsumerInfoList.add(sortConsumerInfo);
                 }
             }
-            read.close();
             LOGGER.info("success get sort consumer");
             return sortConsumerInfoList;
         } catch (IOException e) {
@@ -105,11 +104,11 @@ public class MaintenanceToolsServiceImpl implements 
MaintenanceToolsService {
     @Override
     public Boolean resetCursor(MultipartFile file, String resetTime) {
         
LoginUserUtils.getLoginUser().getRoles().add(UserRoleCode.INLONG_SERVICE);
-        try (InputStreamReader read = new 
InputStreamReader((file.getInputStream()), StandardCharsets.UTF_8)) {
+        try (BufferedReader bufferedReader =
+                new BufferedReader(new 
InputStreamReader((file.getInputStream()), StandardCharsets.UTF_8))) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date = sdf.parse(resetTime);
             long timeStamp = date.getTime();
-            BufferedReader bufferedReader = new BufferedReader(read);
             String readerStr = null;
             while ((readerStr = bufferedReader.readLine()) != null) {
                 String[] sinkIdList = readerStr.split(InlongConstants.COMMA);
@@ -124,7 +123,6 @@ public class MaintenanceToolsServiceImpl implements 
MaintenanceToolsService {
                     queueOperator.resetCursor(groupInfo, streamEntity, 
sinkEntity, timeStamp);
                 }
             }
-            read.close();
             LOGGER.info("success reset cursor consumer");
         } catch (Exception e) {
             LOGGER.error("reset cursor consumer failed:", e);