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

Make BlackboardPostEvent handle nulls from ModuleDataEvent.getArtifacts()

Browse Source
This commit is contained in:
Richard Cordovano 2015-04-29 11:18:27 -04:00
parent 2d73282bf4
commit 54a995ed1d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/org/sleuthkit/autopsy/ingest/events/BlackboardPostEvent.java
View File

@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.ingest.events;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.Immutable;
@ -60,11 +61,11 @@ public final class BlackboardPostEvent extends AutopsyEvent implements Serializa
*/ */
super( super(
IngestManager.IngestModuleEvent.DATA_ADDED.toString(), IngestManager.IngestModuleEvent.DATA_ADDED.toString(),
new SerializableEventData(eventData.getModuleName(), eventData.getArtifactType(), new SerializableEventData(eventData.getModuleName(), eventData.getArtifactType(), eventData.getArtifacts() != null ?
eventData.getArtifacts() eventData.getArtifacts()
.stream() .stream()
.map(BlackboardArtifact::getArtifactID) .map(BlackboardArtifact::getArtifactID)
.collect(Collectors.toList())), .collect(Collectors.toList()) : Collections.emptyList()),
null null
); );
this.eventData = eventData; this.eventData = eventData;
@ -95,7 +96,7 @@ public final class BlackboardPostEvent extends AutopsyEvent implements Serializa
for (Long id : data.artifactIds) { for (Long id : data.artifactIds) {
artifacts.add(Case.getCurrentCase().getSleuthkitCase().getBlackboardArtifact(id)); artifacts.add(Case.getCurrentCase().getSleuthkitCase().getBlackboardArtifact(id));
} }
eventData = new ModuleDataEvent(data.moduleName, data.artifactType, artifacts); eventData = new ModuleDataEvent(data.moduleName, data.artifactType, !artifacts.isEmpty() ? artifacts : null);
return eventData; return eventData;
} catch (IllegalStateException | TskCoreException ex) { } catch (IllegalStateException | TskCoreException ex) {
logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex); logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex);