From 5d202c4edc00e0628145d9a2f2f0ce46b33223b2 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Mon, 9 Mar 2020 14:24:51 -0400
Subject: [PATCH] Fix non-critical error path
---
bindings/java/jni/dataModel_SleuthkitJNI.cpp | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
index 39bdcc8a4..e64092204 100644
--- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp
+++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp
@@ -1225,21 +1225,12 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_runAddImgNat(JNIEnv * env,
}
if (ret == 1) {
- //fatal error
+ // Fatal error
setThrowTskCoreError(env, msgss.str().c_str());
}
else if (ret == 2) {
- // TODO TODO
- setThrowTskCoreError(env, msgss.str().c_str());
- /*
- if (tskAuto->isDbOpen()) {
- // if we can still talk to the database, it's a non-fatal error
- setThrowTskDataError(env, msgss.str().c_str());
- }
- else {
- // we cannot talk to the database, fatal error
- setThrowTskCoreError(env, msgss.str().c_str());
- }*/
+ // Non-fatal error
+ setThrowTskDataError(env, msgss.str().c_str());
}
}
--
GitLab