From 847c5274e6f0ab2b4ce192220c6dc7c4204fd263 Mon Sep 17 00:00:00 2001
From: Nick Davis <nick.davis@narfindustries.com>
Date: Thu, 22 Jun 2017 13:24:12 -0400
Subject: [PATCH] use .equals() instead of == for comparison of
 EamArtifact.Type objects. check EamArtifactInstance fields for null before
 displaying them in the content viewer table.

---
 .../contentviewer/DataContentViewerOtherCases.java   |  2 +-
 .../DataContentViewerOtherCasesTableModel.java       | 12 +++++++++---
 .../datamodel/AbstractSqlEamDb.java                  |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java
index f4679d52a6..77e254a902 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java
@@ -483,7 +483,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
         Collection<EamArtifactInstance> eamArtifactInstances = new ArrayList<>();
         try {
             EamDb dbManager = EamDb.getInstance();
-            if (dbManager.getCorrelationArtifactTypeByName("FILES") == eamArtifact.getArtifactType()) {
+            if (dbManager.getCorrelationArtifactTypeByName("FILES").equals(eamArtifact.getArtifactType())) {
                 try {
                     Collection<EamGlobalFileInstance> eamGlobalFileInstances = dbManager.getGlobalFileInstancesByHash(eamArtifact.getArtifactValue());
                     for (EamGlobalFileInstance eamGlobalFileInstance : eamGlobalFileInstances) {
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java
index 5977444044..9181b6f844 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java
@@ -133,13 +133,19 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
 
         switch (colId) {
             case CASE_NAME:
-                value = eamArtifactInstance.getEamCase().getDisplayName();
+                if (null != eamArtifactInstance.getEamCase()) {
+                    value = eamArtifactInstance.getEamCase().getDisplayName();
+                }
                 break;
             case DEVICE:
-                value = eamArtifactInstance.getEamDataSource().getDeviceID();
+                if (null != eamArtifactInstance.getEamDataSource()) {
+                    value = eamArtifactInstance.getEamDataSource().getDeviceID();
+                }
                 break;
             case DATA_SOURCE:
-                value = eamArtifactInstance.getEamDataSource().getName();
+                if (null != eamArtifactInstance.getEamDataSource()) {
+                    value = eamArtifactInstance.getEamDataSource().getName();
+                }
                 break;
             case FILE_PATH:
                 value = eamArtifactInstance.getFilePath();
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java
index 4c7c0e09a4..fd522ec7dd 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java
@@ -1204,7 +1204,7 @@ public abstract class AbstractSqlEamDb implements EamDb {
     public boolean isArtifactGlobalKnownBad(EamArtifact eamArtifact) throws EamDbException {
 
         // TEMP: Only support file types
-        if (eamArtifact.getArtifactType() != getCorrelationArtifactTypeByName("FILES")) {
+        if (!eamArtifact.getArtifactType().equals(getCorrelationArtifactTypeByName("FILES"))) {
             return false;
         }