From ccc4dba6e53af0e4850179f6f2fe7dc116b3a162 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Tue, 12 Sep 2023 13:51:59 -0400
Subject: [PATCH] solr by default in upgrade
---
.../autopsy/keywordsearch/KeywordSearchJobSettings.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java
index 133c3b37db..f04506d76a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettings.java
@@ -29,7 +29,8 @@
public final class KeywordSearchJobSettings implements IngestModuleIngestJobSettings {
private static final long serialVersionUID = 1L;
-
+ private static final boolean DEFAULT_INDEX_TO_SOLR = true;
+
private final HashSet<String> namesOfEnabledKeywordLists;
private HashSet<String> namesOfDisabledKeywordLists; // Added in version 1.1
@@ -42,7 +43,8 @@ public final class KeywordSearchJobSettings implements IngestModuleIngestJobSett
private boolean ocrOnly;
- private boolean indexToSolr;
+ // use object boolean so older settings missing this setting will deserialize to null.
+ private Boolean indexToSolr;
/**
* Constructs ingest job settings for the keywords search module.
@@ -202,7 +204,7 @@ private void upgradeFromOlderVersions() {
}
boolean isIndexToSolrEnabled() {
- return indexToSolr;
+ return indexToSolr == null ? DEFAULT_INDEX_TO_SOLR : indexToSolr;
}
void setIndexToSolrEnabled(boolean enabled){
--
GitLab