You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2010/07/20 20:06:40 UTC
svn commit: r965938 - in /lucene/dev/trunk/solr: CHANGES.txt
src/java/org/apache/solr/core/SolrCore.java
Author: hossman
Date: Tue Jul 20 18:06:39 2010
New Revision: 965938
URL: http://svn.apache.org/viewvc?rev=965938&view=rev
Log:
SOLR-2008: avoid possible RejectedExecutionException w/autoCommit by making SolreCore close the UpdateHandler before closing the SearchExecutor
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=965938&r1=965937&r2=965938&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jul 20 18:06:39 2010
@@ -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
----------------------
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java?rev=965938&r1=965937&r2=965938&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java Tue Jul 20 18:06:39 2010
@@ -690,17 +690,17 @@ public final class SolrCore implements S
SolrException.log(log, e);
}
try {
- closeSearcher();
+ updateHandler.close();
} catch (Exception e) {
SolrException.log(log,e);
}
try {
- searcherExecutor.shutdown();
+ closeSearcher();
} catch (Exception e) {
SolrException.log(log,e);
}
try {
- updateHandler.close();
+ searcherExecutor.shutdown();
} catch (Exception e) {
SolrException.log(log,e);
}