From cdd44ee41d73b6fc4713f282c564b57a79654cbe Mon Sep 17 00:00:00 2001 From: briancaruso Date: Thu, 8 Dec 2011 18:38:25 +0000 Subject: [PATCH] Attempting to prevent slf4j errors on shutdown. --- .../vitro/webapp/search/solr/SolrIndexer.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java index cfa763850..290fc3b86 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java @@ -149,16 +149,16 @@ public class SolrIndexer implements IndexerIface { removeDocumentsFromBeforeRebuild( ); } } catch (Throwable e) { - if( log != null) + if( ! shutdownRequested ) log.debug("could not remove documents from before build, " ,e); } try { - UpdateResponse res = server.commit(); - log.debug("Response after committing to server: "+ res ); + UpdateResponse res = server.commit(); } catch (Throwable e) { - if( log != null) + if( ! shutdownRequested ){ log.debug("could not commit to solr server, " + - "this should not be a problem since solr will do autocommit"); + "this should not be a problem since solr will do autocommit"); + } } indexing = false; notifyAll(); @@ -169,9 +169,11 @@ public class SolrIndexer implements IndexerIface { server.deleteByQuery("indexedTime:[ * TO " + reindexStart + " ]"); server.commit(); } catch (SolrServerException e) { - log.error("could not delete documents from before rebuild.",e); + if( ! shutdownRequested ) + log.error("could not delete documents from before rebuild.",e); } catch (IOException e) { - log.error("could not delete documents from before rebuild.",e); + if( ! shutdownRequested ) + log.error("could not delete documents from before rebuild.",e); } }