You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/02/22 17:26:33 UTC
lucene-solr:branch_6x: SOLR-10120: Clean up earlier so we don't hit
closed resources.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x aeac12e79 -> 1df02f0bc
SOLR-10120: Clean up earlier so we don't hit closed resources.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1df02f0b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1df02f0b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1df02f0b
Branch: refs/heads/branch_6x
Commit: 1df02f0bcb0c03f2337d1d44489080ba99217f4b
Parents: aeac12e
Author: markrmiller <ma...@apache.org>
Authored: Fri Feb 17 11:30:39 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 12:26:18 2017 -0500
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/core/SolrCore.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1df02f0b/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 7ba8305..7cf7e0d 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1488,6 +1488,14 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
throw (Error) e;
}
}
+
+ if (coreStateClosed) {
+ try {
+ cleanupOldIndexDirectories(false);
+ } catch (Exception e) {
+ SolrException.log(log, e);
+ }
+ }
try {
infoRegistry.clear();
@@ -1519,11 +1527,6 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
}
if (coreStateClosed) {
- try {
- cleanupOldIndexDirectories(false);
- } catch (Exception e) {
- SolrException.log(log, e);
- }
try {
directoryFactory.close();