From 7db3c6249bb2bb3f13d0e6ab8fc05d7701cb729a Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Thu, 16 Apr 2020 13:38:08 -0400
Subject: [PATCH] Revert testing changes
---
.../src/org/sleuthkit/datamodel/TimelineManager.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
index d2b7e4081..296b54837 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
@@ -515,8 +515,6 @@ Set<TimelineEvent> addEventsForNewFileQuiet(AbstractFile file, CaseDbConnection
TimelineEventType.FILE_ACCESSED, file.getAtime(),
TimelineEventType.FILE_CHANGED, file.getCtime(),
TimelineEventType.FILE_MODIFIED, file.getMtime());
- List<TimelineEventType> tempList = ImmutableList.of(TimelineEventType.FILE_MODIFIED,
- TimelineEventType.FILE_ACCESSED, TimelineEventType.FILE_CREATED, TimelineEventType.FILE_CHANGED);
/*
* If there are no legitimate ( greater than zero ) time stamps skip the
@@ -534,9 +532,10 @@ Set<TimelineEvent> addEventsForNewFileQuiet(AbstractFile file, CaseDbConnection
long descriptionID = addEventDescription(file.getDataSourceObjectId(), fileObjId, null,
description, null, null, false, false, connection);
- for (TimelineEventType type : tempList) {
- Long time = timeMap.get(type);
+ for (Map.Entry<TimelineEventType, Long> timeEntry : timeMap.entrySet()) {
+ Long time = timeEntry.getValue();
if (time > 0 && time < MAX_TIMESTAMP_TO_ADD) {// if the time is legitimate ( greater than zero and less then 12 years from current date) insert it
+ TimelineEventType type = timeEntry.getKey();
long eventID = addEventWithExistingDescription(time, type, descriptionID, connection);
/*
@@ -548,7 +547,7 @@ Set<TimelineEvent> addEventsForNewFileQuiet(AbstractFile file, CaseDbConnection
description, null, null, false, false));
} else {
if (time >= MAX_TIMESTAMP_TO_ADD) {
- //logger.log(Level.WARNING, String.format("Date/Time discarded from Timeline for %s for file %s with Id %d", timeEntry.getKey().getDisplayName(), file.getParentPath() + file.getName(), file.getId()));
+ logger.log(Level.WARNING, String.format("Date/Time discarded from Timeline for %s for file %s with Id %d", timeEntry.getKey().getDisplayName(), file.getParentPath() + file.getName(), file.getId()));
}
}
}
@@ -558,7 +557,7 @@ Set<TimelineEvent> addEventsForNewFileQuiet(AbstractFile file, CaseDbConnection
}
return events;
- }
+ }
/**
* Add any events that can be created from the given Artifact. If the
--
GitLab