You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2024/09/21 05:01:47 UTC
(iotdb) branch rc/1.3.3 updated: [To rc/1.3.3] Don't print warn log for sort tmp file delete
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
new f09c99d101e [To rc/1.3.3] Don't print warn log for sort tmp file delete
f09c99d101e is described below
commit f09c99d101e2e1af3d23e3345461eb87c22996b5
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Sat Sep 21 13:01:42 2024 +0800
[To rc/1.3.3] Don't print warn log for sort tmp file delete
---
.../main/java/org/apache/iotdb/commons/utils/FileUtils.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
index 1fca92394af..420dfda6c1f 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
@@ -65,16 +65,19 @@ public class FileUtils {
deleteFileOrDirectory(file, false);
}
- public static void deleteFileOrDirectory(File file, boolean quiteForNoSuchFile) {
+ public static void deleteFileOrDirectory(File file, boolean quietForNoSuchFile) {
if (file.isDirectory()) {
- for (File subfile : file.listFiles()) {
- deleteFileOrDirectory(subfile);
+ File[] files = file.listFiles();
+ if (files != null) {
+ for (File subfile : files) {
+ deleteFileOrDirectory(subfile, quietForNoSuchFile);
+ }
}
}
try {
Files.delete(file.toPath());
} catch (NoSuchFileException e) {
- if (!quiteForNoSuchFile) {
+ if (!quietForNoSuchFile) {
LOGGER.warn("{}: {}", e.getMessage(), Arrays.toString(file.list()), e);
}
} catch (DirectoryNotEmptyException e) {