From 52672d752859777246ccf183c63f546ee90834b9 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 19 Jan 2015 08:46:16 +0000
Subject: [PATCH] SSDM-1339 using monitored FileOperations for deletion in
FileDeleter
SVN: 33274
---
.../server/plugins/standard/archiver/FileDeleter.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java
index 84c7093f12b..5318ccab0ef 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java
@@ -27,7 +27,9 @@ import java.util.Properties;
import org.apache.commons.lang.time.DateUtils;
import org.apache.log4j.Logger;
+import ch.systemsx.cisd.common.filesystem.FileOperations;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
+import ch.systemsx.cisd.common.filesystem.IFileOperations;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.EMailAddress;
@@ -252,11 +254,12 @@ public class FileDeleter
{
try
{
- if (file.delete())
+ IFileOperations fileOperations = FileOperations.getMonitoredInstanceForCurrentThread();
+ if (fileOperations.delete(file))
{
return true;
}
- return file.exists() == false;
+ return fileOperations.exists(file) == false;
} catch (Throwable t)
{
return false;
--
GitLab