Merge pull request #7901 from gdicristofaro/jenkins_bug_fix_24_05_08

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

View File

@ -2737,7 +2737,7 @@ public class Case {
* with a standard name, physically located in the case
* 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);
} else {
/*
@ -2823,12 +2823,15 @@ public class Case {
Throwable curEx = ex;
// max depth search for a concurrent db access exception will be 10
for (int i = 0; i < 10; i++) {
if (curEx instanceof ConcurrentDbAccessException foundEx) {
if (curEx == null) {
break;
} else if (curEx instanceof ConcurrentDbAccessException foundEx) {
concurrentEx = foundEx;
break;
}
} else {
curEx = curEx.getCause();
}
}
if (concurrentEx != null) {
throw new CaseActionException(Bundle.Case_throwIfConcurrentDbAccessException_fileLock_concurrentAccessException(