From 4d88b017f87b6b5856058fed234b19d895e79110 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Wed, 31 May 2017 14:57:44 -0400 Subject: [PATCH] Do not log search cancellation as an error --- .../org/sleuthkit/autopsy/keywordsearch/SearchRunner.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java index 6db8b6beb3..6f5407e4a4 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011 - 2014 Basis Technology Corp. + * Copyright 2011 - 2017 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -214,8 +214,10 @@ public final class SearchRunner { // block until the search is complete finalSearcher.get(); - } catch (InterruptedException | ExecutionException ex) { - logger.log(Level.WARNING, "Job {1} final search thread failed: {2}", new Object[]{job.getJobId(), ex}); //NON-NLS + } catch (InterruptedException | CancellationException ex) { + logger.log(Level.INFO, "Final search for search job {1} interrupted or cancelled", job.getJobId()); //NON-NLS + } catch (ExecutionException ex) { + logger.log(Level.SEVERE, String.format("Final search for search job %d failed", job.getJobId()), ex); //NON-NLS } } }