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

Omaha #3137 - Add checks to prevent NullPointerException.

Browse source 
(cherry picked from commit 936f0278683f54bbb27127d40d0b9fb6e195bbb7 [formerly b235e56e28] [formerly 8753350174 [formerly d901d99bde] [formerly 3331d58e1c] [formerly 8753350174 [formerly d901d99bde] [formerly 3331d58e1c] [formerly b235e56e28 [formerly 3331d58e1c [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]]]])

Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurgeManager.java

Former-commit-id: 9c212d6ccd [formerly d6cae492e8] [formerly 5ade33ba5069ec127c89a77ec40b4ea882de4eca [formerly 43117cf31b]] [formerly 9c212d6ccd [formerly d6cae492e8] [formerly 5ade33ba5069ec127c89a77ec40b4ea882de4eca [formerly 43117cf31b]] [formerly 01b30e76c4 [formerly 43117cf31b [formerly deb766cbc3c173d4ec3593b22b8e371c79789e7a]]]]
Former-commit-id: 01b30e76c4
Former-commit-id: efe71641e7 [formerly d48ae916fa] [formerly c1f1afc6fd94286ffa334c1951e9fa8b4f6acd70 [formerly 128b060e9f]]
Former-commit-id: ad1b62ceeccc43c63ed109a6c4adf7a5f59296f5 [formerly 1905640a3a]
Former-commit-id: 6928b2a90b
This commit is contained in:
Roger Ferrel 2014-05-28 09:52:51 -05:00 • committed by Steve Harris
parent 101481752f
commit 801eebda64
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

@ -62,6 +62,7 @@ import com.raytheon.uf.edex.database.cluster.handler.SharedLockHandler.LockType;
* ------------ ---------- ----------- --------------------------
* Apr 01, 2014 2862 rferrel Initial creation
*
* May 28, 2014 3137 rferrel Checks to prevent NullPointerException.
* </pre>
*
* @author rferrel
@ -386,7 +387,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)) {
@ -418,7 +422,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)) {