summaryrefslogtreecommitdiffstats
path: root/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
diff options
context:
space:
mode:
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index 7530d651f19..28ad003a2d6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -127,13 +127,13 @@ public class FileDirectory extends AbstractComponent {
return addFile(source, fileReference, hash);
}
- public void delete(FileReference fileReference, Function<FileReference, Boolean> canBeDeleted) {
+ public void delete(FileReference fileReference, Function<FileReference, Boolean> isInUse) {
if (useLock.value())
try (Lock lock = locks.lock(fileReference)) {
- if (canBeDeleted.apply(fileReference))
- deleteDirRecursively(destinationDir(fileReference));
- else
+ if (isInUse.apply(fileReference))
log.log(Level.FINE, "Unable to delete file reference '" + fileReference.value() + "' since it is still in use");
+ else
+ deleteDirRecursively(destinationDir(fileReference));
}
else
deleteDirRecursively(destinationDir(fileReference));