From 0c36fc628161478f9cad58c2f4daff6a7cfcb174 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Thu, 13 Sep 2018 12:43:49 -0400
Subject: [PATCH] Fix error resulting from merge issue of exception being added
 to method

---
 .../autopsy/contentviewers/AnnotationsContentViewer.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
index 6380d1fb6f..1b1a2280b0 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
@@ -31,6 +31,7 @@ import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
+import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeNormalizationException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil;
@@ -92,7 +93,7 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
                  * present in the node. In this case, the selected item IS the
                  * source file.
                  */
-                sourceFile = (AbstractFile) node.getLookup().lookup(AbstractFile.class);
+                sourceFile = node.getLookup().lookup(AbstractFile.class);
             }
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, String.format(
@@ -235,7 +236,7 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
                 if (commentDataFound == false) {
                     addMessage(html, "There is no comment data for the selected content in the central repository.");
                 }
-            } catch (EamDbException | TskCoreException ex) {
+            } catch (EamDbException | TskCoreException | CorrelationAttributeNormalizationException ex) {
                 logger.log(Level.SEVERE, "Error connecting to the central repository database.", ex); // NON-NLS
             }
             endSection(html);