You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by yo...@apache.org on 2010/10/21 18:00:07 UTC

svn commit: r1026044 - /lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java

Author: yonik
Date: Thu Oct 21 16:00:07 2010
New Revision: 1026044

URL: http://svn.apache.org/viewvc?rev=1026044&view=rev
Log:
SOLR-2180: make sure core is closed even if closing request causes an exception

Modified:
    lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java

Modified: lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1026044&r1=1026043&r2=1026044&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Thu Oct 21 16:00:07 2010
@@ -230,8 +230,11 @@ public class EmbeddedSolrServer extends 
       throw new SolrServerException( ex );
     }
     finally {
-      if (req != null) req.close();
-      core.close();
+      try {
+        if (req != null) req.close();
+      } finally {
+        core.close();
+      }
     }
   }