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

SOLR-10120: Clean up earlier so we don't hit closed resources.

This commit is contained in:
markrmiller 2017-02-17 11:30:39 -05:00
parent ed05debb4e
commit 19c8ec2bf1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
solr/core/src/java/org/apache/solr/core/SolrCore.java
View File

@ -1506,6 +1506,14 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
}
}
if (coreStateClosed) {
try {
cleanupOldIndexDirectories(false);
} catch (Exception e) {
SolrException.log(log, e);
}
}
try {
infoRegistry.clear();
} catch (Throwable e) {
@ -1536,11 +1544,6 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
}
if (coreStateClosed) {
try {
cleanupOldIndexDirectories(false);
} catch (Exception e) {
SolrException.log(log, e);
}
try {
directoryFactory.close();