From 1f8fbfaa2426dd3be804b3871fc495fd02adbb52 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 2 Oct 2021 15:34:55 +0100 Subject: [PATCH] Missed a few topOnly references from the last commit. --- .../java/org/qortal/controller/repository/PruneManager.java | 3 +-- src/main/java/org/qortal/repository/Bootstrap.java | 4 ++-- src/main/java/org/qortal/repository/RepositoryManager.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/qortal/controller/repository/PruneManager.java b/src/main/java/org/qortal/controller/repository/PruneManager.java index 1904a014..685f0eea 100644 --- a/src/main/java/org/qortal/controller/repository/PruneManager.java +++ b/src/main/java/org/qortal/controller/repository/PruneManager.java @@ -35,8 +35,7 @@ public class PruneManager { public void start() { this.executorService = Executors.newCachedThreadPool(new DaemonThreadFactory()); - if (Settings.getInstance().isTopOnly() && - !Settings.getInstance().isArchiveEnabled()) { + if (Settings.getInstance().isTopOnly()) { // Top-only-sync this.startTopOnlySyncMode(); } diff --git a/src/main/java/org/qortal/repository/Bootstrap.java b/src/main/java/org/qortal/repository/Bootstrap.java index 13175949..1d08b7a3 100644 --- a/src/main/java/org/qortal/repository/Bootstrap.java +++ b/src/main/java/org/qortal/repository/Bootstrap.java @@ -328,10 +328,10 @@ public class Bootstrap { } private String getFilename() { - boolean pruningEnabled = Settings.getInstance().isTopOnly(); + boolean isTopOnly = Settings.getInstance().isTopOnly(); boolean archiveEnabled = Settings.getInstance().isArchiveEnabled(); - if (pruningEnabled) { + if (isTopOnly) { return "bootstrap-toponly.7z"; } else if (archiveEnabled) { diff --git a/src/main/java/org/qortal/repository/RepositoryManager.java b/src/main/java/org/qortal/repository/RepositoryManager.java index ba58bf44..e97806f0 100644 --- a/src/main/java/org/qortal/repository/RepositoryManager.java +++ b/src/main/java/org/qortal/repository/RepositoryManager.java @@ -79,7 +79,7 @@ public abstract class RepositoryManager { } public static boolean prune(Repository repository) { - // Bulk prune the database the first time we use pruning mode + // Bulk prune the database the first time we use top-only or block archive mode if (Settings.getInstance().isTopOnly() || Settings.getInstance().isArchiveEnabled()) { if (RepositoryManager.canArchiveOrPrune()) {