mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
fix for npe in HTCache cleaning process
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4981 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
parent
f7aaeb3fad
commit
441e9c861e
|
@ -401,15 +401,15 @@ public final class plasmaHTCache {
|
|||
return false;
|
||||
}
|
||||
|
||||
private static boolean deleteFileandDirs(File obj, String msg) {
|
||||
if (deleteFile(obj)) {
|
||||
log.logInfo("DELETED " + msg + " CACHE: " + obj.toString());
|
||||
obj = obj.getParentFile();
|
||||
private static boolean deleteFileandDirs(File path, String msg) {
|
||||
if (deleteFile(path)) {
|
||||
log.logInfo("DELETED " + msg + " CACHE: " + path.toString());
|
||||
path = path.getParentFile(); // returns null if the path does not have a parent
|
||||
// If the has been emptied, remove it
|
||||
// Loop as long as we produce empty driectoriers, but stop at HTCACHE
|
||||
while ((!(obj.equals(cachePath))) && (obj.isDirectory()) && (obj.list().length == 0)) {
|
||||
if (obj.delete()) if (log.isFine()) log.logFine("DELETED EMPTY DIRECTORY : " + obj.toString());
|
||||
obj = obj.getParentFile();
|
||||
// Loop as long as we produce empty directories, but stop at HTCACHE
|
||||
while (path != null && !(path.equals(cachePath)) && path.isDirectory() && path.list().length == 0) { // NPE
|
||||
if (path.delete()) if (log.isFine()) log.logFine("DELETED EMPTY DIRECTORY : " + path.toString());
|
||||
path = path.getParentFile(); // returns null if the path does not have a parent
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user