From 01c60023a9dc73627223e91b09b4ec07ffec5f13 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Thu, 28 May 2020 07:39:31 -0400
Subject: [PATCH] Cleanup
---
.../org/sleuthkit/datamodel/AddDataSourceCallbacks.java | 7 -------
bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java | 3 +++
.../java/src/org/sleuthkit/datamodel/SleuthkitJNI.java | 1 +
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java b/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java
index 8718caad8..e47ecca20 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/AddDataSourceCallbacks.java
@@ -42,11 +42,4 @@ public interface AddDataSourceCallbacks {
* @throws AddDataSourceCallbacksException
*/
void onFilesAdded(List<Long> fileObjectIds) throws AddDataSourceCallbacksException;
-
- /**
- * Call when the data source processing is complete.
- *
- * @throws AddDataSourceCallbacksException
- */
- void onCompleted() throws AddDataSourceCallbacksException;
}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
index 0f15f6e72..68c5eb6cb 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/JniDbHelper.java
@@ -403,6 +403,7 @@ private long addBatchedFilesToDb() {
logger.log(Level.SEVERE, "Error adding file to the database - parent object ID: " + computedParentObjId
+ ", file system object ID: " + fileInfo.fsObjId + ", name: " + fileInfo.name, ex);
revertTransaction();
+ batchedFiles.clear();
return -1;
}
}
@@ -413,12 +414,14 @@ private long addBatchedFilesToDb() {
addDataSourceCallbacks.onFilesAdded(newObjIds);
} catch (AddDataSourceCallbacksException ex) {
logger.log(Level.SEVERE, "Error adding files to ingest stream");
+ batchedFiles.clear();
return -1;
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error adding batched files to database", ex);
revertTransaction();
+ batchedFiles.clear();
return -1;
}
batchedFiles.clear();
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
index 50b332524..87d74f915 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java
@@ -550,6 +550,7 @@ public void run(String deviceId, String[] imageFilePaths, int sectorSize) throws
* (e.g., a UUID).
* @param imageFilePaths Full path(s) to the image file(s).
* @param sectorSize The sector size (use '0' for autodetect).
+ * @param addDataSourceCallbacks The callbacks to use to send data to ingest (may do nothing).
*
* @throws TskCoreException if a critical error occurs within the
* SleuthKit.
--
GitLab