From b235e56e28545407559fdd7a37c70b26b57e0499 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Wed, 28 May 2014 09:52:51 -0500 Subject: [PATCH] Omaha #3137 - Add checks to prevent NullPointerException. Former-commit-id: 42dcb85d536485f3ae244e69a315e88169d04c97 --- .../uf/edex/archive/purge/ArchivePurgeManager.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java b/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java index 1ff098d62d..283ea12027 100644 --- a/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java +++ b/edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java @@ -64,6 +64,7 @@ import com.raytheon.uf.edex.database.cluster.handler.SharedLockHandler.LockType; * ------------ ---------- ----------- -------------------------- * Apr 01, 2014 2862 rferrel Initial creation * Apr 24, 2014 2726 rjpeter Added shutdown cancel + * May 28, 2014 3137 rferrel Checks to prevent NullPointerException. * * * @author rferrel @@ -392,7 +393,10 @@ public class ArchivePurgeManager { } else if (file.isDirectory()) { purgeCount += purgeDir(file, defaultTimeFilter, minPurgeTime, extPurgeTime, helper, category, ct); - if (file.list().length == 0) { + + // Something other then purger deleted the directory. + String[] fileList = file.list(); + if ((fileList != null) && (fileList.length == 0)) { purgeCount += deleteFile(file); } } else if (defaultTimeFilter.accept(file)) { @@ -429,7 +433,9 @@ public class ArchivePurgeManager { if (!file.isHidden()) { if (file.isDirectory()) { purgeCount += purgeDir(file, fileDataFilter); - if (file.list().length == 0) { + // Something other then purger deleted the directory. + String[] fileList = file.list(); + if ((fileList != null) && (fileList.length == 0)) { purgeCount += deleteFile(file); } } else if (fileDataFilter.accept(file)) {