From f7e0beb537e14de0e82ad4336b285b55be78a6a6 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 2 Dec 2020 21:39:56 +0100 Subject: [PATCH] fix detection of temporary folder --- .../java/de/bixilon/minosoft/config/StaticConfiguration.java | 1 + .../java/de/bixilon/minosoft/data/assets/AssetsManager.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.java b/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.java index 436ccb3a1..6ad7c9200 100644 --- a/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.java +++ b/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.java @@ -27,6 +27,7 @@ public class StaticConfiguration { public static boolean LOG_RELATIVE_TIME = false; // prefix all log messages with the relative start time in milliseconds instead of the formatted time public static boolean VERBOSE_ENTITY_META_DATA_LOGGING = false; // if true, the entity meta data is getting serialized public static String HOME_DIRECTORY; + public static final String TEMPORARY_FOLDER = System.getProperty("java.io.tmpdir", HOME_DIRECTORY + "/tmp/") + "/"; static { // Sets Config.homeDir to the correct folder per OS diff --git a/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java b/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java index 2ab67f53c..d688a8b9c 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java +++ b/src/main/java/de/bixilon/minosoft/data/assets/AssetsManager.java @@ -13,7 +13,6 @@ package de.bixilon.minosoft.data.assets; -import com.google.common.base.StandardSystemProperty; import com.google.errorprone.annotations.DoNotCall; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; @@ -258,8 +257,7 @@ public class AssetsManager { private static String saveAsset(InputStream data) throws IOException { File tempDestinationFile = null; while (tempDestinationFile == null || tempDestinationFile.exists()) { // file exist? lol - //noinspection ConstantConditions - tempDestinationFile = new File(System.getProperty(StandardSystemProperty.JAVA_IO_TMPDIR.value()) + "/minosoft/" + Util.generateRandomString(32)); + tempDestinationFile = new File(StaticConfiguration.TEMPORARY_FOLDER + "minosoft/" + Util.generateRandomString(32)); } Util.createParentFolderIfNotExist(tempDestinationFile);