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 2014/01/17 03:40:58 UTC
svn commit: r1558998 - in /lucene/dev/branches/lucene_solr_4_6: ./ solr/
solr/solrj/
solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
Author: markrmiller
Date: Fri Jan 17 02:40:57 2014
New Revision: 1558998
URL: http://svn.apache.org/r1558998
Log:
SOLR-4260: If in blockUntilFinished and there are no Runners running and the queue is not empty, start a new Runner.
Modified:
lucene/dev/branches/lucene_solr_4_6/ (props changed)
lucene/dev/branches/lucene_solr_4_6/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_6/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
Modified: lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1558998&r1=1558997&r2=1558998&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Fri Jan 17 02:40:57 2014
@@ -390,6 +390,10 @@ public class ConcurrentUpdateSolrServer
if (runner != null) {
runner.runnerLock.lock();
runner.runnerLock.unlock();
+ } else if (!queue.isEmpty()) {
+ Runner r = new Runner();
+ runners.add(r);
+ scheduler.execute(r);
}
}
} finally {