diff --git a/src/main/java/caosdb/server/ServerProperties.java b/src/main/java/caosdb/server/ServerProperties.java index a9268179c00e304badbffaa582ab5bf8a082d538..65eff4ffbde6a2b73d7aaf4f9ea7407990b3c8b9 100644 --- a/src/main/java/caosdb/server/ServerProperties.java +++ b/src/main/java/caosdb/server/ServerProperties.java @@ -145,7 +145,7 @@ public class ServerProperties extends Properties { serverProperties.setProperty(KEY_MYSQL_USER_NAME, "CaosDB"); serverProperties.setProperty(KEY_MYSQL_USER_PASSWORD, "CaosDB"); - serverProperties.setProperty(KEY_MYSQL_SCHEMA_VERSION, "v2.0.30"); + serverProperties.setProperty(KEY_MYSQL_SCHEMA_VERSION, "v2.0.31"); serverProperties.setProperty(KEY_BASE_PATH, basepath); serverProperties.setProperty(KEY_CONTEXT_ROOT, ""); diff --git a/src/main/java/caosdb/server/entity/FileProperties.java b/src/main/java/caosdb/server/entity/FileProperties.java index 7263b9b2b5e14f51988fa13dd969cf47f941478c..fbf8031f56566ea5a6df263d97611812bab113d0 100644 --- a/src/main/java/caosdb/server/entity/FileProperties.java +++ b/src/main/java/caosdb/server/entity/FileProperties.java @@ -216,8 +216,7 @@ public class FileProperties { }; } - private static Undoable delete(final File file) - throws IOException, InterruptedException { + private static Undoable delete(final File file) 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 4687b2c5ad241baddc6662c5fb043ac955839ff6..b5a82ef33d9a50da0568defd614d6c86048c8cd9 100644 --- a/src/main/java/caosdb/server/resource/ScriptingResource.java +++ b/src/main/java/caosdb/server/resource/ScriptingResource.java @@ -96,10 +96,12 @@ public class ScriptingResource extends AbstractCaosDBServerResource { private void deleteTmpFiles() { for (FileProperties p : deleteFiles) { try { - p.getFile().delete(); + p.getFile().delete(); } catch (Exception t) { if (getLogger().isLoggable(Level.WARNING)) { - getLogger().warning("Could not delete tmp file: " + p.getPath() + "\nException: " + t.toString()); + getLogger() + .warning( + "Could not delete tmp file: " + p.getPath() + "\nException: " + t.toString()); } } }