From 08ebc3a5ae6d17a84f6415d67dc45775bc940c7c Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 22 Apr 2014 10:40:02 -0400 Subject: [PATCH] Catch exception in org.sleuthkit.autopsy.keywordsearch.Server.isRunning() --- .../src/org/sleuthkit/autopsy/keywordsearch/Server.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java index 5b3baa041f..07cda49234 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java @@ -60,6 +60,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.datamodel.Content; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.client.solrj.impl.XMLResponseParser; +import org.apache.solr.common.SolrException; /** * Handles for keeping track of a Solr server and its cores @@ -533,12 +534,16 @@ public class Server { // probably caused by starting a connection as the server finishes // shutting down) if (cause instanceof ConnectException || cause instanceof SocketException) { //|| cause instanceof NoHttpResponseException) { - logger.log(Level.INFO, "Solr server is not running, cause: " + cause.getMessage()); + logger.log(Level.INFO, "Solr server is not running, cause: {0}", cause.getMessage()); return false; } else { throw new KeywordSearchModuleException( NbBundle.getMessage(this.getClass(), "Server.isRunning.exception.errCheckSolrRunning.msg"), ex); } + } catch (SolrException ex) { + // Just log 404 errors for now... + logger.log(Level.INFO, "Solr server is not running", ex); + return false; } catch (IOException ex) { throw new KeywordSearchModuleException( NbBundle.getMessage(this.getClass(), "Server.isRunning.exception.errCheckSolrRunning.msg2"), ex);