mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7901 from gdicristofaro/jenkins_bug_fix_24_05_08

Browse Source 
Jenkins bug fix 5/8/24
This commit is contained in:
Mark McKinnon 2024-05-09 16:00:56 -04:00 committed by GitHub
commit 89f765dd4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -2737,7 +2737,7 @@ public class Case {
* with a standard name, physically located in the case * with a standard name, physically located in the case
* directory. * directory.
*/ */
caseDb = SleuthkitCase.newCase(Paths.get(metadata.getCaseDirectory(), SINGLE_USER_CASE_DB_NAME, APP_NAME).toString()); caseDb = SleuthkitCase.newCase(Paths.get(metadata.getCaseDirectory(), SINGLE_USER_CASE_DB_NAME).toString(), (ContentStreamProvider) null, APP_NAME);
metadata.setCaseDatabaseName(SINGLE_USER_CASE_DB_NAME); metadata.setCaseDatabaseName(SINGLE_USER_CASE_DB_NAME);
} else { } else {
/* /*
@ -2823,11 +2823,14 @@ public class Case {
Throwable curEx = ex; Throwable curEx = ex;
// max depth search for a concurrent db access exception will be 10 // max depth search for a concurrent db access exception will be 10
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
if (curEx instanceof ConcurrentDbAccessException foundEx) { if (curEx == null) {
break;
} else if (curEx instanceof ConcurrentDbAccessException foundEx) {
concurrentEx = foundEx; concurrentEx = foundEx;
break; break;
} else {
curEx = curEx.getCause();
} }
curEx = curEx.getCause();
} }
if (concurrentEx != null) { if (concurrentEx != null) {