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

Fix DataSourceAnalysisEvent.getDataSource NPEs

Browse Source
This commit is contained in:
Richard Cordovano 2018-12-14 12:27:51 -05:00
parent 5b0e8526e2
commit 2fb1409e4a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/org/sleuthkit/autopsy/ingest/events/DataSourceAnalysisEvent.java
View File

@ -39,6 +39,7 @@ public abstract class DataSourceAnalysisEvent extends AutopsyEvent implements Se
private final long ingestJobId; private final long ingestJobId;
private final long dataSourceIngestJobId; private final long dataSourceIngestJobId;
private transient Content dataSource; private transient Content dataSource;
private final long dataSourceObjectId;
/** /**
* Constructs an instance of the base class for events published in * Constructs an instance of the base class for events published in
@ -56,6 +57,7 @@ public abstract class DataSourceAnalysisEvent extends AutopsyEvent implements Se
this.ingestJobId = ingestJobId; this.ingestJobId = ingestJobId;
this.dataSourceIngestJobId = dataSourceIngestJobId; this.dataSourceIngestJobId = dataSourceIngestJobId;
this.dataSource = dataSource; this.dataSource = dataSource;
this.dataSourceObjectId = dataSource.getId();
} }
/** /**
@ -81,7 +83,8 @@ public abstract class DataSourceAnalysisEvent extends AutopsyEvent implements Se
/** /**
* Gets the data source associated with this event. * Gets the data source associated with this event.
* *
* @return The data source. * @return The data source or null if there is an error getting the data
* source from an event published by a remote node.
*/ */
public Content getDataSource() { public Content getDataSource() {
/** /**
@ -96,11 +99,10 @@ public abstract class DataSourceAnalysisEvent extends AutopsyEvent implements Se
return dataSource; return dataSource;
} }
try { try {
long id = (Long) super.getNewValue(); dataSource = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(dataSourceObjectId);
dataSource = Case.getCurrentCaseThrows().getSleuthkitCase().getContentById(id);
return dataSource; return dataSource;
} catch (NoCurrentCaseException | TskCoreException ex) { } catch (NoCurrentCaseException | TskCoreException ex) {
logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex); //NON-NLS logger.log(Level.SEVERE, String.format("Error doing lazy load of data source (objId=%d) for remote event", this.dataSourceObjectId), ex); //NON-NLS
return null; return null;
} }
} }