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 2013/12/29 19:58:18 UTC
svn commit: r1554053 - in /lucene/dev/trunk/solr: CHANGES.txt
solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
Author: markrmiller
Date: Sun Dec 29 18:58:18 2013
New Revision: 1554053
URL: http://svn.apache.org/r1554053
Log:
SOLR-5583: ConcurrentUpdateSolrServer#blockUntilFinished may wait forever if the executor service is shutdown.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1554053&r1=1554052&r2=1554053&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Dec 29 18:58:18 2013
@@ -315,6 +315,9 @@ Bug Fixes
HttpClients and ensure all http connection managers get shutdown.
(Mark Miller)
+* SOLR-5583: ConcurrentUpdateSolrServer#blockUntilFinished may wait forever if
+ the executor service is shutdown. (Mark Miller)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1554053&r1=1554052&r2=1554053&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Sun Dec 29 18:58:18 2013
@@ -384,7 +384,7 @@ public class ConcurrentUpdateSolrServer
synchronized (runners) {
runner = runners.peek();
}
- if (runner == null)
+ if (runner == null || scheduler.isTerminated())
break;
runner.runnerLock.lock();
runner.runnerLock.unlock();