From 123ab7feb40affaf43138955d79de7334c836950 Mon Sep 17 00:00:00 2001 From: apriestman <apriestman@basistech.com> Date: Fri, 29 May 2020 07:19:02 -0400 Subject: [PATCH] More review comments --- .../src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java | 2 +- bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java b/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java index 1dd055e71..2e5ee97dc 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java +++ b/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java @@ -32,7 +32,7 @@ public interface AddDataSourceCallbacks { void onDataSourceAdded(long dataSourceObjectId); /** - * Call to add a set of file object IDs that are ready for ingest. + * Call to add a set of file object IDs that have been added to the database. * * @param fileObjectIds List of file object IDs. */ diff --git a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java index 59b257a26..3c6e050c9 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java +++ b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java @@ -40,7 +40,7 @@ class JniDbHelper { private final SleuthkitCase caseDb; private CaseDbTransaction trans = null; - AddDataSourceCallbacks addDataSourceCallbacks; + private final AddDataSourceCallbacks addDataSourceCallbacks; private final Map<Long, Long> fsIdToRootDir = new HashMap<>(); private final Map<Long, TskData.TSK_FS_TYPE_ENUM> fsIdToFsType = new HashMap<>(); @@ -125,9 +125,7 @@ long addImageInfo(int type, long ssize, String timezone, } commitTransaction(); - if (addDataSourceCallbacks != null) { - addDataSourceCallbacks.onDataSourceAdded(objId); - } + addDataSourceCallbacks.onDataSourceAdded(objId); return objId; } catch (TskCoreException ex) { logger.log(Level.SEVERE, "Error adding image to the database", ex); -- GitLab