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

SOLR-2008: avoid possible RejectedExecutionException w/autoCommit by making SolreCore close the UpdateHandler before closing the SearchExecutor 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@965938 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2010-07-20 18:06:39 +00:00
parent f608d4efc6
commit f521e84c5a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -376,6 +376,11 @@ Bug Fixes
* SOLR-1995: Change date format from "hour in am/pm" to "hour in day"
in CoreContainer and SnapShooter. (Hayato Ito, koji)
* SOLR-2008: avoid possible RejectedExecutionException w/autoCommit
by making SolreCore close the UpdateHandler before closing the
SearchExecutor. (NarasimhaRaju, hossman)
Other Changes
----------------------

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

@ -689,6 +689,11 @@ public final class SolrCore implements SolrInfoMBean {
} catch (Exception e) {
SolrException.log(log, e);
}
try {
updateHandler.close();
} catch (Exception e) {
SolrException.log(log,e);
}
try {
closeSearcher();
} catch (Exception e) {
@ -699,11 +704,6 @@ public final class SolrCore implements SolrInfoMBean {
} catch (Exception e) {
SolrException.log(log,e);
}
try {
updateHandler.close();
} catch (Exception e) {
SolrException.log(log,e);
}
if( closeHooks != null ) {
for( CloseHook hook : closeHooks ) {
hook.close( this );