From 8d30c98f69d0575632adcce48f4b5f6a13223c1f Mon Sep 17 00:00:00 2001
From: zhangzq7 <zhangzq7@asiainfo.com>
Date: Tue, 1 Nov 2022 10:34:06 +0800
Subject: [PATCH] check list is null and use foreach instead of fori

---
 .../handler/ServerLoadDataInfileHandler.java     | 16 ++++++++--------
 .../util/dataMigrator/DataMigratorUtil.java      | 14 ++++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/mycat/server/handler/ServerLoadDataInfileHandler.java b/src/main/java/io/mycat/server/handler/ServerLoadDataInfileHandler.java
index 6ea41af6b..641cb47be 100644
--- a/src/main/java/io/mycat/server/handler/ServerLoadDataInfileHandler.java
+++ b/src/main/java/io/mycat/server/handler/ServerLoadDataInfileHandler.java
@@ -774,14 +774,14 @@ private static void deleteFile(String dirPath) {
             return;
         }
         File[] fileList = fileDirToDel.listFiles();
-
-        for (int i = 0; i < fileList.length; i++) {
-            File file = fileList[i];
-            if (file.isFile() && file.exists()) {
-                boolean delete = file.delete();
-            } else if (file.isDirectory()) {
-                deleteFile(file.getAbsolutePath());
-                file.delete();
+        if (fileList != null) {
+            for (File file : fileList) {
+                if (file.isFile() && file.exists()) {
+                    file.delete();
+                } else if (file.isDirectory()) {
+                    deleteFile(file.getAbsolutePath());
+                    file.delete();
+                }
             }
         }
         fileDirToDel.delete();
diff --git a/src/main/java/io/mycat/util/dataMigrator/DataMigratorUtil.java b/src/main/java/io/mycat/util/dataMigrator/DataMigratorUtil.java
index 6a2089750..980cf7496 100644
--- a/src/main/java/io/mycat/util/dataMigrator/DataMigratorUtil.java
+++ b/src/main/java/io/mycat/util/dataMigrator/DataMigratorUtil.java
@@ -180,12 +180,14 @@ public static long countLine(File file) throws IOException{
     public static boolean deleteDir(File dir) {
         if (dir.isDirectory()) {
             String[] children = dir.list();
-            for (int i=0; i<children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
-                if (!success) {
-                    return false;
-                }
-            }
+			if (children != null) {
+				for (String child : children) {
+					boolean success = deleteDir(new File(dir, child));
+					if (!success) {
+						return false;
+					}
+				}
+			}
         }
         // 目录此时为空，可以删除
         return dir.delete();