[INLONG-9760][Manager] Make sure BufferedReader close properly (#9761)

apache · Mar 1, 2024 · 408baab · 408baab
1 parent e926126
commit 408baab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java b/...-plugins/base/src/main/java/org/apache/inlong/manager/plugin/util/FlinkConfiguration.java
@@ -95,8 +95,9 @@ public FlinkConfig getFlinkConfig() {
  */
  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/.../java/org/apache/inlong/manager/service/maintenanceTools/MaintenanceToolsServiceImpl.java b/.../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 List<SortConsumerInfo> getSortConsumer(MultipartFile file) {
  sortConsumerInfoList.add(sortConsumerInfo);
  }
  }
- read.close();
  LOGGER.info("success get sort consumer");
  return sortConsumerInfoList;
  } catch (IOException e) {
@@ -105,11 +104,11 @@ public List<SortConsumerInfo> getSortConsumer(MultipartFile file) {
  @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 Boolean resetCursor(MultipartFile file, String resetTime) {
  queueOperator.resetCursor(groupInfo, streamEntity, sinkEntity, timeStamp);
  }
  }
- read.close();
  LOGGER.info("success reset cursor consumer");
  } catch (Exception e) {
  LOGGER.error("reset cursor consumer failed:", e);