From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
index 221d7f8..da71b43 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
@@ -52,7 +52,12 @@
if (command == null) {
return null;
}
- CommandLine commandLine = new CommandLine(ConfigurationHandler.getConfiguration().getBorgCommand());
+ String borgCommand = ConfigurationHandler.getConfiguration().getBorgCommand();
+ if (StringUtils.isBlank(borgCommand)) {
+ log.error("Can't run empty borg command.");
+ return null;
+ }
+ CommandLine commandLine = new CommandLine(borgCommand);
commandLine.addArgument(command.getCommand());
if (command.getParams() != null) {
for (String param : command.getParams()) {
@@ -101,7 +106,7 @@
@Override
public JobResult<String> execute() {
- if (DemoRepos.isDemo(command.getRepoConfig().getRepo())) {
+ if (command.getRepoConfig() != null && DemoRepos.isDemo(command.getRepoConfig().getRepo())) {
return DemoRepos.execute(this);
}
return super.execute();
@@ -125,6 +130,9 @@
if (progressInfo != null) {
clone.setProgressInfo(progressInfo.clone());
}
+ clone.setCreateTime(getCreateTime());
+ clone.setStartTime(getStartTime());
+ clone.setStopTime(getStopTime());
return clone;
}
--
Gitblit v1.10.0