From 20320eb2f44b0d55b0b16c5ccc637e9fea9c91b7 Mon Sep 17 00:00:00 2001 From: adam-m Date: Mon, 19 Nov 2012 15:30:17 -0500 Subject: [PATCH] fix keyword search timer reset - can't resuse the old timer object --- .../keywordsearch/KeywordSearchIngestModule.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index c30b763ffa..dac751b3bd 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -811,7 +811,12 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile @Override protected Object doInBackground() throws Exception { - logger.log(Level.INFO, "Pending start of new searcher"); + if (finalRun) { + logger.log(Level.INFO, "Pending start of new (final) searcher"); + } + else { + logger.log(Level.INFO, "Pending start of new searcher"); + } final String displayName = "Keyword Search" + (finalRun ? " - Finalizing" : ""); progress = ProgressHandleFactory.createHandle(displayName + (" (Pending)"), new Cancellable() { @@ -1082,7 +1087,10 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile } else { //start counting time for a new searcher to start //unless final searcher is pending - if (finalSearcher != null) { + if (finalSearcher == null) { + //we need a new Timer object, because restarting previus will not cause firing of the action + final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000; + searchTimer = new Timer(updateIntervalMs, new SearchTimerAction()); searchTimer.start(); } }