Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8253: Ensure ZK server is always shutdown in AbstractDistribZkTestBase 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1713443 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alan Woodward 2015-11-09 14:34:18 +00:00
parent f12cb52a3b
commit ccfdb5dce2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -457,6 +457,9 @@ Other Changes
* SOLR-8239: Added ClassicSimilarityFactory, marked DefaultSimilarityFactory as deprecated. (hossman)
* SOLR-8253: AbstractDistribZkTestBase can sometimes fail to shut down its
ZKServer (Alan Woodward)
================== 5.3.1 ==================
Bug Fixes

8
solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
View File

@ -268,8 +268,12 @@ public abstract class AbstractDistribZkTestBase extends BaseDistributedSearchTes
System.clearProperty(MockDirectoryFactory.SOLR_TESTS_ALLOW_READING_FILES_STILL_OPEN_FOR_WRITE);
resetExceptionIgnores();
super.distribTearDown();
zkServer.shutdown();
try {
super.distribTearDown();
}
finally {
zkServer.shutdown();
}
}
protected void printLayout() throws Exception {