(iotdb) branch master updated: Load: Avoid NPE when load task ends after clean task's execution (#12474)

[rong]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f7f34de5d3f Load: Avoid NPE when load task ends after clean task's 
execution (#12474)
f7f34de5d3f is described below

commit f7f34de5d3fb6ff84a2b9d9bc2dd65bc657551b3
Author: Steve Yurong Su <r...@apache.org>
AuthorDate: Tue May 7 10:00:52 2024 +0800

    Load: Avoid NPE when load task ends after clean task's execution (#12474)
---
 .../iotdb/db/queryengine/execution/load/LoadTsFileManager.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
index 1ef706a8bdb..ef4ed7f16b9 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/load/LoadTsFileManager.java
@@ -201,8 +201,10 @@ public class LoadTsFileManager {
   }
 
   private void forceCloseWriterManager(String uuid) {
-    uuid2WriterManager.get(uuid).close();
-    uuid2WriterManager.remove(uuid);
+    final TsFileWriterManager writerManager = uuid2WriterManager.remove(uuid);
+    if (Objects.nonNull(writerManager)) {
+      writerManager.close();
+    }
 
     final Path loadDirPath = loadDir.toPath();
     if (!Files.exists(loadDirPath)) {