From 335e17731c6f6ea258af8f3b11ee551bc55c54dd Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 29 Dec 2018 21:56:15 +0000
Subject: [PATCH] Configuration.workingDir is now set correctly.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java | 3 +++
borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
index 1b39a9e..28af84c 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
@@ -2,7 +2,9 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AccessLevel;
import lombok.Getter;
+import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,6 +21,7 @@
private static final String RESTORE_DIRNAME = "restore";
@JsonIgnore
+ @Setter(AccessLevel.PACKAGE)
private File workingDir;
@Getter
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
index a5a6f26..41bb53c 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
@@ -55,6 +55,7 @@
}
}
}
+ this.configuration.setWorkingDir(workingDir);
} catch (IOException ex) {
log.error("Error while trying to read from config file: " + configFile.getAbsolutePath() + ": " + ex.getMessage(), ex);
return;
--
Gitblit v1.10.0