change to Blackboard.postArtifact()

This commit is contained in:
millmanorama
2018-05-11 13:01:13 +02:00
parent 765baf5a5a
commit eefecc2c98
20 changed files with 25 additions and 24 deletions
@@ -2250,7 +2250,6 @@ public class Case {
private void close(ProgressIndicator progressIndicator) {
IngestManager.getInstance().cancelAllIngestJobs(IngestJob.CancellationReason.CASE_CLOSED);
caseDb.unregisterForEvents(tskEventForwarder);
/*
* Stop sending/receiving case events to and from other nodes if this is
* a multi-user case.
@@ -2287,6 +2286,7 @@ public class Case {
*/
if (null != caseDb) {
progressIndicator.progress(Bundle.Case_progressMessage_closingCaseDatabase());
caseDb.unregisterForEvents(tskEventForwarder);
caseDb.close();
}
@@ -47,7 +47,7 @@ public final class Blackboard implements Closeable {
}
/**
* Indexes the text associated with the an artifact.
* Indexes the text associated with an artifact.
*
* @param artifact The artifact to be indexed.
*
@@ -59,7 +59,7 @@ public final class Blackboard implements Closeable {
}
try {
delegate.publishArtifact(artifact);
delegate.postArtifact(artifact);
} catch (org.sleuthkit.datamodel.Blackboard.BlackboardException ex) {
throw new BlackboardException("Error indexing artifact", ex);
}
@@ -164,7 +164,7 @@ public class IngestEventsListener {
try {
// index the artifact for keyword search
Blackboard blackboard = Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboard();
blackboard.publishArtifact(tifArtifact);
blackboard.postArtifact(tifArtifact);
} catch (Blackboard.BlackboardException | NoCurrentCaseException ex) {
LOGGER.log(Level.SEVERE, "Unable to index blackboard artifact " + tifArtifact.getArtifactID(), ex); //NON-NLS
}
@@ -315,7 +315,7 @@ final class IngestModule implements FileIngestModule {
try {
// index the artifact for keyword search
blackboard.publishArtifact(tifArtifact);
blackboard.postArtifact(tifArtifact);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + tifArtifact.getArtifactID(), ex); //NON-NLS
}
@@ -721,7 +721,7 @@ class SevenZipExtractor {
try {
// index the artifact for keyword search
blackboard.publishArtifact(artifact);
blackboard.postArtifact(artifact);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(
@@ -120,7 +120,7 @@ final class EncryptionDetectionDataSourceIngestModule implements DataSourceInges
/*
* Index the artifact for keyword search.
*/
blackboard.publishArtifact(artifact);
blackboard.postArtifact(artifact);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex); //NON-NLS
}
@@ -180,7 +180,7 @@ final class EncryptionDetectionFileIngestModule extends FileIngestModuleAdapter
/*
* Index the artifact for keyword search.
*/
blackboard.publishArtifact(artifact);
blackboard.postArtifact(artifact);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex); //NON-NLS
}
@@ -213,7 +213,7 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
try {
// index the artifact for keyword search
blackboard.publishArtifact(bba);
blackboard.postArtifact(bba);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bba.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(
@@ -146,7 +146,7 @@ public class FileExtMismatchIngestModule implements FileIngestModule {
try {
// index the artifact for keyword search
blackboard.publishArtifact(bart);
blackboard.postArtifact(bart);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bart.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(FileExtMismatchDetectorModuleFactory.getModuleName(), Bundle.FileExtMismatchIngestModule_indexError_message());
@@ -157,7 +157,7 @@ public class FileTypeIdIngestModule implements FileIngestModule {
attributes.add(ruleNameAttribute);
artifact.addAttributes(attributes);
try {
Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboard().publishArtifact(artifact);
Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboard().postArtifact(artifact);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, String.format("Unable to index TSK_INTERESTING_FILE_HIT blackboard artifact %d (file obj_id=%d)", artifact.getArtifactID(), file.getId()), ex); //NON-NLS
} catch (NoCurrentCaseException ex) {
@@ -313,7 +313,7 @@ public class HashDbIngestModule implements FileIngestModule {
try {
// index the artifact for keyword search
blackboard.publishArtifact(badFile);
blackboard.postArtifact(badFile);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + badFile.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(
@@ -163,7 +163,7 @@ final class CallLogAnalyzer {
bba.addAttributes(attributes);
try {
// index the artifact for keyword search
blackboard.publishArtifact(bba);
blackboard.postArtifact(bba);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bba.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(
@@ -173,7 +173,7 @@ final class ContactAnalyzer {
bba.addAttributes(attributes);
try {
// index the artifact for keyword search
blackboard.publishArtifact(bba);
blackboard.postArtifact(bba);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bba.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(
@@ -169,7 +169,7 @@ class TextMessageAnalyzer {
bba.addAttributes(attributes);
try {
// index the artifact for keyword search
blackboard.publishArtifact(bba);
blackboard.postArtifact(bba);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bba.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(
@@ -145,7 +145,7 @@ final class FilesIdentifierIngestModule implements FileIngestModule {
artifact.addAttributes(attributes);
try {
// index the artifact for keyword search
blackboard.publishArtifact(artifact);
blackboard.postArtifact(artifact);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(Bundle.FilesIdentifierIngestModule_indexError_message(), artifact.getDisplayName());
@@ -89,7 +89,7 @@ class StixArtifactData {
bba.addAttributes(attributes);
try {
// index the artifact for keyword search
blackboard.publishArtifact(bba);
blackboard.postArtifact(bba);
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to index blackboard artifact " + bba.getArtifactID(), ex); //NON-NLS
MessageNotifyUtil.Notify.error(Bundle.StixArtifactData_indexError_message(), bba.getDisplayName());