Merge pull request #6830 from kellykelly3/7356-ui-not-updating-datasource

7356 - When ingest fails allow the tree to popup with the datasource
This commit is contained in:
Richard Cordovano 2021-04-12 17:32:28 -04:00 committed by GitHub
commit a19a0a880c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -284,10 +284,10 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
ingestStream = IngestManager.getInstance().openIngestStream(image, settings); ingestStream = IngestManager.getInstance().openIngestStream(image, settings);
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error starting ingest modules", ex); logger.log(Level.SEVERE, "Error starting ingest modules", ex);
final List<String> errors = new ArrayList<>(); // There was an error with ingest, but the data source has already been added
errors.add(ex.getMessage()); // so proceed with the defaultIngestStream. Code in openIngestStream
callBack.done(DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS, errors, new ArrayList<>()); // should have caused a dialog to popup with the errors.
return; ingestStream = new DefaultIngestStream();
} }
doAddImageProcess(deviceId, imagePath, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, progress, callBack); doAddImageProcess(deviceId, imagePath, sectorSize, timeZone, ignoreFatOrphanFiles, md5, sha1, sha256, progress, callBack);