From ee09928767bf81c2bd8ff961e935b3a15c21aeb3 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Mon, 22 Oct 2018 21:14:23 +0200
Subject: [PATCH] BUG: Delete tmp files after script terminated
---
src/main/java/caosdb/server/entity/FileProperties.java | 2 +-
src/main/java/caosdb/server/resource/ScriptingResource.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/caosdb/server/entity/FileProperties.java b/src/main/java/caosdb/server/entity/FileProperties.java
index e31e9f9e..7263b9b2 100644
--- a/src/main/java/caosdb/server/entity/FileProperties.java
+++ b/src/main/java/caosdb/server/entity/FileProperties.java
@@ -217,7 +217,7 @@ public class FileProperties {
}
private static Undoable delete(final File file)
- throws IOException, InterruptedException, CaosDBException {
+ throws IOException, InterruptedException {
if (file.getAbsolutePath().startsWith(FileSystem.getBasepath())) {
final Undoable d;
final File parent = file.getParentFile();
diff --git a/src/main/java/caosdb/server/resource/ScriptingResource.java b/src/main/java/caosdb/server/resource/ScriptingResource.java
index 30a9cdb3..4687b2c5 100644
--- a/src/main/java/caosdb/server/resource/ScriptingResource.java
+++ b/src/main/java/caosdb/server/resource/ScriptingResource.java
@@ -96,10 +96,10 @@ public class ScriptingResource extends AbstractCaosDBServerResource {
private void deleteTmpFiles() {
for (FileProperties p : deleteFiles) {
try {
- p.deleteFile();
+ p.getFile().delete();
} catch (Exception t) {
if (getLogger().isLoggable(Level.WARNING)) {
- getLogger().warning("Could not delete tmp file: " + t.toString());
+ getLogger().warning("Could not delete tmp file: " + p.getPath() + "\nException: " + t.toString());
}
}
}
--
GitLab