From adfecc6ba868902f529e46b239773fedd97b1868 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Wed, 5 Dec 2012 18:20:43 +0100 Subject: [PATCH] more robustness during shutdown --- .../federate/solr/connector/EmbeddedSolrConnector.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java index 8da12ae48..7293a852f 100644 --- a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java @@ -28,6 +28,7 @@ import javax.xml.parsers.ParserConfigurationException; import net.yacy.cora.federate.solr.SolrServlet; import net.yacy.cora.federate.solr.YaCySchema; +import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.MemoryControl; import org.apache.solr.client.solrj.SolrServerException; @@ -145,10 +146,10 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo @Override public synchronized void close() { - this.commit(); - super.close(); - this.defaultCore.close(); - this.cores.shutdown(); + try {this.commit();} catch (Throwable e) {Log.logException(e);} + try {super.close();} catch (Throwable e) {Log.logException(e);} + try {this.defaultCore.close();} catch (Throwable e) {Log.logException(e);} + try {this.cores.shutdown();} catch (Throwable e) {Log.logException(e);} } public SolrQueryRequest request(final SolrParams params) {