From 2affa1a03f8f4713c6d7dad936f3d494179f7e6e Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 15 Dec 2018 19:41:50 +0000
Subject: [PATCH] ...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
index bfd1cd2..bf96c44 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
@@ -67,6 +67,8 @@
}
if (repository == null) {
log.warn("Repo with name '" + repoConfig.getRepo() + "' not found.");
+ } else {
+ repoConfig.setId(repository.getId());
}
return repository;
}
@@ -130,15 +132,15 @@
}
/**
- * @param repoName
+ * @param repoIdOrName
* @param archiveIdOrName
* @param forceReload If true, any cache value will be ignored. Default is false.
* @return
*/
- public Archive getArchive(String repoName, String archiveIdOrName, boolean forceReload) {
- BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(repoName);
+ public Archive getArchive(String repoIdOrName, String archiveIdOrName, boolean forceReload) {
+ BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(repoIdOrName);
if (repoConfig == null) {
- log.error("Can't find configured repo '" + repoName + "'.");
+ log.error("Can't find configured repo '" + repoIdOrName + "'.");
return null;
}
return getArchive(repoConfig, archiveIdOrName, forceReload);
--
Gitblit v1.10.0