You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/08/27 19:21:27 UTC
svn commit: r1620946 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java
Author: thelabdude
Date: Wed Aug 27 17:21:27 2014
New Revision: 1620946
URL: http://svn.apache.org/r1620946
Log:
SOLR-6443: don't close the zk client from the test, possible fix for jenkins failures
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java?rev=1620946&r1=1620945&r2=1620946&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java Wed Aug 27 17:21:27 2014
@@ -58,7 +58,7 @@ public class TestManagedResourceStorage
zkStorageIO.configure(loader, initArgs);
doStorageTests(loader, zkStorageIO);
} finally {
- zkClient.close();
+ loader.close();
}
}
@@ -70,12 +70,16 @@ public class TestManagedResourceStorage
public void testFileBasedJsonStorage() throws Exception {
File instanceDir = createTempDir("json-storage");
SolrResourceLoader loader = new SolrResourceLoader(instanceDir.getAbsolutePath());
- NamedList<String> initArgs = new NamedList<>();
- String managedDir = instanceDir.getAbsolutePath() + File.separator + "managed";
- initArgs.add(ManagedResourceStorage.STORAGE_DIR_INIT_ARG, managedDir);
- FileStorageIO fileStorageIO = new FileStorageIO();
- fileStorageIO.configure(loader, initArgs);
- doStorageTests(loader, fileStorageIO);
+ try {
+ NamedList<String> initArgs = new NamedList<>();
+ String managedDir = instanceDir.getAbsolutePath() + File.separator + "managed";
+ initArgs.add(ManagedResourceStorage.STORAGE_DIR_INIT_ARG, managedDir);
+ FileStorageIO fileStorageIO = new FileStorageIO();
+ fileStorageIO.configure(loader, initArgs);
+ doStorageTests(loader, fileStorageIO);
+ } finally {
+ loader.close();
+ }
}
/**