From 29aaf1d6b6e7c48d5d241e5ea6523a9ba3ae9568 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 7 Dec 2018 11:21:27 -0500 Subject: [PATCH] 4440 fix bug with content viewer not being enabled for non-file common property search results --- .../OtherOccurrenceNodeInstanceData.java | 18 +++--------------- .../CentralRepoCommonAttributeInstance.java | 4 +--- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java index b049613f33..79dcf21f64 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java @@ -122,20 +122,8 @@ class OtherOccurrenceNodeInstanceData implements OtherOccurrenceNodeData { */ boolean isCentralRepoNode() { return (originalCorrelationInstance != null); - } - - /** - * Uses the saved instance plus type and value to make a new CorrelationAttribute. - * Should only be called if isCentralRepoNode() is true. - * @return the newly created CorrelationAttribute - */ - CorrelationAttributeInstance getCorrelationAttribute() throws EamDbException { - if (! isCentralRepoNode() ) { - throw new EamDbException("Can not create CorrelationAttribute for non central repo node"); - } - return originalCorrelationInstance; - } - + } + /** * Get the case name * @return the case name @@ -206,7 +194,7 @@ class OtherOccurrenceNodeInstanceData implements OtherOccurrenceNodeData { * @return the original abstract file */ AbstractFile getAbstractFile() throws EamDbException { - if (originalCorrelationInstance == null) { + if (originalAbstractFile == null) { throw new EamDbException("AbstractFile is null"); } return originalAbstractFile; diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java index f38b936cf9..e0fbb6478e 100644 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java +++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java @@ -77,7 +77,6 @@ final public class CentralRepoCommonAttributeInstance extends AbstractCommonAttr // Only attempt to make the abstract file if the attribute is from the current case if (currentCase.getName().equals(currentAttributeInstance.getCorrelationCase().getCaseUUID())) { - SleuthkitCase tskDb = currentCase.getSleuthkitCase(); // Find the correct data source @@ -98,8 +97,7 @@ final public class CentralRepoCommonAttributeInstance extends AbstractCommonAttr parentPath += File.separator; } parentPath = parentPath.replace("\\", "/"); - - final String whereClause = String.format("lower(name) = '%s' AND md5 = '%s' AND lower(parent_path) = '%s' AND data_source_obj_id = %s", fileName, currentAttribute.getCorrelationValue(), parentPath, dataSource.get().getId()); + final String whereClause = String.format("lower(name) = '%s' AND lower(parent_path) = '%s' AND data_source_obj_id = %s", fileName, parentPath, dataSource.get().getId()); List potentialAbstractFiles = tskDb.findAllFilesWhere(whereClause); if (potentialAbstractFiles.isEmpty()) {