Author: tommaso Date: Tue Oct 8 09:30:51 2019 New Revision: 1868122 URL: http://svn.apache.org/viewvc?rev=1868122&view=rev Log: OAK-8244 - Make sure to close SolrClient on #tearDown
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java?rev=1868122&r1=1868121&r2=1868122&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java Tue Oct 8 09:30:51 2019 @@ -36,16 +36,24 @@ import org.apache.jackrabbit.oak.plugins import org.apache.solr.client.solrj.SolrClient; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.After; import static org.junit.Assert.assertNotNull; public class SolrOakRepositoryStub extends OakSegmentTarRepositoryStub { + private SolrServerProvider solrServerProvider; + public SolrOakRepositoryStub(Properties settings) throws RepositoryException { super(settings); } + @After + public void tearDown() throws Exception{ + solrServerProvider.close(); + } + @Override protected void preCreateRepository(Jcr jcr) { File f = new File("target" + File.separatorChar + "queryjcrtest-" + System.currentTimeMillis()); @@ -55,10 +63,12 @@ public class SolrOakRepositoryStub exten } catch (Exception e) { throw new RuntimeException(e); } - SolrServerProvider solrServerProvider = new SolrServerProvider() { + solrServerProvider = new SolrServerProvider() { @Override public void close() throws IOException { - + if (solrServer != null) { + solrServer.close(); + } } @Nullable Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java?rev=1868122&r1=1868121&r2=1868122&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java Tue Oct 8 09:30:51 2019 @@ -73,6 +73,7 @@ public abstract class SolrBaseTest { if (server != null && server.ping() != null) { server.deleteByQuery("*:*"); server.commit(); + server.close(); server = null; } }