From 85069c93de631a3f3fc19617d8e161ec31d69ed6 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 3 Jan 2020 17:52:23 -0500 Subject: [PATCH] ensure configuration.localStorageDir always has a value --- .../src/main/java/bubble/server/BubbleConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java index b97acb4b..e7ab9221 100644 --- a/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java +++ b/bubble-server/src/main/java/bubble/server/BubbleConfiguration.java @@ -66,6 +66,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration public static final String TAG_CLOUD_DRIVERS = "cloudDrivers"; public static final String DEFAULT_LOCALE = "en_US"; + public static final String DEFAULT_LOCAL_STORAGE_DIR = HOME_DIR + "/.bubble_local_storage"; public BubbleConfiguration (BubbleConfiguration other) { copy(this, other); } @@ -109,7 +110,8 @@ public class BubbleConfiguration extends PgRestServerConfiguration public boolean hasSageNode () { return getSageNode() != null; } @Getter @Setter private String letsencryptEmail; - @Getter @Setter private String localStorageDir = HOME_DIR + "/.bubble_local_storage"; + @Setter private String localStorageDir = DEFAULT_LOCAL_STORAGE_DIR; + public String getLocalStorageDir () { return empty(localStorageDir) ? DEFAULT_LOCAL_STORAGE_DIR : localStorageDir; } @Setter private File bubbleJar; public File getBubbleJar () {