svn commit: r1687198 - /jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java

[tommaso]

Author: tommaso
Date: Wed Jun 24 08:37:07 2015
New Revision: 1687198

URL: http://svn.apache.org/r1687198
Log:
OAK-3029 - check Solr core can be loaded in embedded server

Modified:
    
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java?rev=1687198&r1=1687197&r2=1687198&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
 Wed Jun 24 08:37:07 2015
@@ -108,7 +108,17 @@ public class EmbeddedSolrServerProvider
 
                 CoreContainer coreContainer = new CoreContainer(solrHomePath);
                 try {
-                    coreContainer.load();
+                    if (!coreContainer.isLoaded(coreName)) {
+                        coreContainer.load();
+                    }
+                } catch (Exception e) {
+                    log.error("cannot load core {}, shutting down embedded 
Solr..", coreName, e);
+                    try {
+                        coreContainer.shutdown();
+                    } catch (Exception se) {
+                        log.error("could not shutdown embedded Solr", se);
+                    }
+                    return null;
                 } finally {
                     Thread.currentThread().setContextClassLoader(classLoader);
                 }