From bcba98e1ee8e672d3db9038c93be0964d775e470 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Tue, 13 Feb 2018 06:36:46 +0900
Subject: [PATCH] fix #1501 fixed NPE
---
.../java/org/codelibs/fess/thumbnail/ThumbnailManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index aeb53037d..f1462a448 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -447,7 +447,11 @@ public class ThumbnailManager {
}
private boolean deleteEmptyDirectory(final Path dir) throws IOException {
- if (dir.toFile().list().length == 0 && !dir.toFile().getName().equals(THUMBNAILS_DIR_NAME)) {
+ if (dir == null) {
+ return false;
+ }
+ final File directory = dir.toFile();
+ if (directory.list() != null && directory.list().length == 0 && !THUMBNAILS_DIR_NAME.equals(directory.getName())) {
Files.delete(dir);
if (logger.isDebugEnabled()) {
logger.debug("Delete " + dir);
--
GitLab