Merge branch 'release-4.7.0' of https://github.com/sleuthkit/sleuthkit into...

Merge branch 'release-4.7.0' of https://github.com/sleuthkit/sleuthkit into 5664-contact-account-type

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -323,11 +323,11 @@ EventTypeHierarchyLevel.event=Event
 DataSourcesFilter.displayName.text=Data Source
 DescriptionFilter.mode.exclude=Exclude
 DescriptionFilter.mode.include=Include
-hashHitsFilter.displayName.text=Hash Sets
+hashHitsFilter.displayName.text=Hash Hits Only
 hideKnownFilter.displayName.text=Hide Known Files
 # {0} - sub filter displaynames
 IntersectionFilter.displayName.text=Intersection 
-tagsFilter.displayName.text=Tagged Items
+tagsFilter.displayName.text=Tagged Items Only
 TextFilter.displayName.text=Text Filter
 TypeFilter.displayName.text=Event Type
 FileTypesFilter.displayName.text=File Types
\ No newline at end of file

bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java

@@ -805,6 +805,10 @@ public Set<Long> updateEventsForArtifactTagDeleted(BlackboardArtifact artifact)
 	}
 
 	private void updateEventSourceTaggedFlag(CaseDbConnection conn, Collection<Long> eventDescriptionIDs, int flagValue) throws TskCoreException {
+		if (eventDescriptionIDs.isEmpty()) {
+			return;
+		}
+		
 		String sql = "UPDATE tsk_event_descriptions SET tagged = " + flagValue + " WHERE event_description_id IN (" + buildCSVString(eventDescriptionIDs) + ")"; //NON-NLS
 		try (Statement updateStatement = conn.createStatement()) {
 			updateStatement.executeUpdate(sql);
@@ -831,12 +835,16 @@ public Set<Long> updateEventsForHashSetHit(Content content) throws TskCoreExcept
 		caseDB.acquireSingleUserCaseWriteLock();
 		try (CaseDbConnection con = caseDB.getConnection(); Statement updateStatement = con.createStatement();) {
 			Map<Long, Long> eventIDs = getEventAndDescriptionIDs(con, content.getId(), true);
-			String sql = "UPDATE tsk_event_descriptions SET hash_hit = 1" + " WHERE event_description_id IN (" + buildCSVString(eventIDs.values()) + ")"; //NON-NLS
-			try {
-				updateStatement.executeUpdate(sql); //NON-NLS
+			if (! eventIDs.isEmpty()) {
+				String sql = "UPDATE tsk_event_descriptions SET hash_hit = 1" + " WHERE event_description_id IN (" + buildCSVString(eventIDs.values()) + ")"; //NON-NLS
+				try {
+					updateStatement.executeUpdate(sql); //NON-NLS
+					return eventIDs.keySet();
+				} catch (SQLException ex) {
+					throw new TskCoreException("Error setting hash_hit of events.", ex);//NON-NLS
+				}
+			} else {
 				return eventIDs.keySet();
-			} catch (SQLException ex) {
-				throw new TskCoreException("Error setting hash_hit of events.", ex);//NON-NLS
 			}
 		} catch (SQLException ex) {
 			throw new TskCoreException("Error setting hash_hit of events.", ex);//NON-NLS