From e48576521051a0dd74d4d838dcec92d249e006e2 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 27 Jul 2017 13:04:42 -0400 Subject: [PATCH] Don't restore the default bad tags if the user disables them all. --- .../centralrepository/datamodel/PostgresEamDbSettings.java | 2 +- .../centralrepository/datamodel/SqliteEamDbSettings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresEamDbSettings.java b/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresEamDbSettings.java index 92d60155e8..a2abe7f23d 100644 --- a/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresEamDbSettings.java +++ b/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresEamDbSettings.java @@ -122,7 +122,7 @@ public final class PostgresEamDbSettings { } String badTagsStr = ModuleSettings.getConfigSetting("CentralRepository", "db.badTags"); // NON-NLS - if (badTagsStr == null || badTagsStr.isEmpty()) { + if (badTagsStr == null) { badTagsStr = DEFAULT_BAD_TAGS; } badTags = new ArrayList<>(Arrays.asList(badTagsStr.split(","))); diff --git a/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDbSettings.java b/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDbSettings.java index 32079777c7..ef9cb662da 100644 --- a/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDbSettings.java +++ b/CentralRepository/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDbSettings.java @@ -90,7 +90,7 @@ public final class SqliteEamDbSettings { } String badTagsStr = ModuleSettings.getConfigSetting("CentralRepository", "db.badTags"); // NON-NLS - if (badTagsStr == null || badTagsStr.isEmpty()) { + if (badTagsStr == null) { badTagsStr = DEFAULT_BAD_TAGS; } badTags = new ArrayList<>(Arrays.asList(badTagsStr.split(",")));