From 9da50733d3ed8ef4408fd2bb1f849cbfe035d780 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Tue, 13 Nov 2018 12:31:34 +0100
Subject: [PATCH] don't use 'extra' field to store id that is also passed to
 the superclass constructor.

---
 .../autopsy/timeline/events/EventAddedEvent.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/events/EventAddedEvent.java b/Core/src/org/sleuthkit/autopsy/timeline/events/EventAddedEvent.java
index 352393d337..0223ba3f3c 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/events/EventAddedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/events/EventAddedEvent.java
@@ -36,12 +36,10 @@ public class EventAddedEvent extends AutopsyEvent implements Serializable {
     private static final Logger logger = Logger.getLogger(EventAddedEvent.class.getName());
 
     private transient TimelineEvent addedEvent;
-    private final long addedEventID;
 
     public EventAddedEvent(org.sleuthkit.datamodel.TimelineManager.EventAddedEvent event) {
         super(Case.Events.EVENT_ADDED.name(), null, event.getAddedEvent().getEventID());
         addedEvent = event.getAddedEvent();
-        addedEventID = addedEvent.getEventID();
     }
 
     /**
@@ -65,6 +63,7 @@ public class EventAddedEvent extends AutopsyEvent implements Serializable {
             return addedEvent;
         }
         try {
+            Long addedEventID = (Long) super.getNewValue();
             addedEvent = Case.getCurrentCaseThrows().getSleuthkitCase().getTimelineManager().getEventById(addedEventID);
             return addedEvent;
         } catch (NoCurrentCaseException | TskCoreException ex) {
@@ -73,6 +72,12 @@ public class EventAddedEvent extends AutopsyEvent implements Serializable {
         }
     }
 
+    /**
+     * Gets the TimelineEvent that was added.
+     *
+     * @return The TimelineEvent or null if there is an error retrieving the
+     *         TimelineEvent.
+     */
     public TimelineEvent getAddedEvent() {
         return getNewValue();
     }