xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #3137 - Add checks to prevent NullPointerException." into omaha_14.4.1

Browse source 
Former-commit-id: daaaed85d5 [formerly 93ab5e949da1f654ea15a2044b587125f3243ebc]
Former-commit-id: 6a01bcd3b0
This commit is contained in:
Richard Peter 2014-05-28 11:07:41 -05:00 • committed by Gerrit Code Review
commit 4299d5cb18
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java
View file

@ -64,6 +64,7 @@ import com.raytheon.uf.edex.database.cluster.handler.SharedLockHandler.LockType;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Apr 01, 2014 2862 rferrel Initial creation * Apr 01, 2014 2862 rferrel Initial creation
* Apr 24, 2014 2726 rjpeter Added shutdown cancel * Apr 24, 2014 2726 rjpeter Added shutdown cancel
* May 28, 2014 3137 rferrel Checks to prevent NullPointerException.
* </pre> * </pre>
* *
* @author rferrel * @author rferrel
@ -392,7 +393,10 @@ public class ArchivePurgeManager {
} else if (file.isDirectory()) { } else if (file.isDirectory()) {
purgeCount += purgeDir(file, defaultTimeFilter, purgeCount += purgeDir(file, defaultTimeFilter,
minPurgeTime, extPurgeTime, helper, category, ct); 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); purgeCount += deleteFile(file);
} }
} else if (defaultTimeFilter.accept(file)) { } else if (defaultTimeFilter.accept(file)) {
@ -429,7 +433,9 @@ public class ArchivePurgeManager {
if (!file.isHidden()) { if (!file.isHidden()) {
if (file.isDirectory()) { if (file.isDirectory()) {
purgeCount += purgeDir(file, fileDataFilter); 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); purgeCount += deleteFile(file);
} }
} else if (fileDataFilter.accept(file)) { } else if (fileDataFilter.accept(file)) {