From 67dd1243073e766178dd70dd2f45aa5bc77ec529 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 05 Jan 2019 22:03:29 +0000
Subject: [PATCH] Job monitor: Cancellation of jobs...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index 7f0a706..b525573 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -35,7 +35,7 @@
.setParams("--version")
.setDescription("Getting borg version.");
JobResult<String> jobResult = execute(command).getResult();
- if (jobResult.getStatus() != JobResult.Status.OK) {
+ if (jobResult == null || jobResult.getStatus() != JobResult.Status.OK) {
return null;
}
String version = jobResult.getResultObject();
@@ -56,7 +56,7 @@
.setParams("--json") // --progress has no effect.
.setDescription("Loading info of repo '" + repoConfig.getDisplayName() + "'.");
JobResult<String> jobResult = execute(command).getResult();
- if (jobResult.getStatus() != JobResult.Status.OK) {
+ if (jobResult == null || jobResult.getStatus() != JobResult.Status.OK) {
return null;
}
String result = jobResult.getResultObject();
@@ -89,7 +89,7 @@
.setParams("--json") // --progress has no effect.
.setDescription("Loading list of archives of repo '" + repoConfig.getDisplayName() + "'.");
JobResult<String> jobResult = execute(command).getResult();
- if (jobResult.getStatus() != JobResult.Status.OK) {
+ if (jobResult == null || jobResult.getStatus() != JobResult.Status.OK) {
log.error("Can't load archives from repo '" + repository.getName() + "'.");
return;
}
@@ -131,7 +131,7 @@
.setParams("--json", "--log-json", "--progress")
.setDescription("Loading info of archive '" + archive.getName() + "' of repo '" + repoConfig.getDisplayName() + "'.");
JobResult<String> jobResult = execute(command).getResult();
- if (jobResult.getStatus() != JobResult.Status.OK) {
+ if (jobResult == null || jobResult.getStatus() != JobResult.Status.OK) {
return;
}
String result = jobResult.getResultObject();
--
Gitblit v1.10.0