From 0bf1c5465f1f3198c53ad02f3209148afabb2038 Mon Sep 17 00:00:00 2001 From: kimi42345 <kimi42345@outlook.com> Date: 星期二, 17 三月 2020 11:24:45 +0800 Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs_spring --- src/main/java/com/highdatas/srs/util/FileUtils.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/highdatas/srs/util/FileUtils.java b/src/main/java/com/highdatas/srs/util/FileUtils.java index cfe5ec0..b77c348 100644 --- a/src/main/java/com/highdatas/srs/util/FileUtils.java +++ b/src/main/java/com/highdatas/srs/util/FileUtils.java @@ -20,6 +20,11 @@ File parentFile = rootFile.getParentFile(); File[] files = rootFile.listFiles(); ArrayList<JSONObject> fileArray = new ArrayList<>(); + if (files == null) { + + return fileArray; + } + for (File one : files) { JSONObject object = new JSONObject(); if (one.isDirectory()) { -- Gitblit v1.8.0