You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/03/25 01:54:39 UTC
svn commit: r1581168 - in /lucene/dev/branches/lucene_solr_4_7: ./ solr/
solr/CHANGES.txt solr/solrj/
solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
Author: sarowe
Date: Tue Mar 25 00:54:39 2014
New Revision: 1581168
URL: http://svn.apache.org/r1581168
Log:
SOLR-5760: ConcurrentUpdateSolrServer has a blockUntilFinished call when streamDeletes is true that should be tucked into the if statement below it. (merged branch_4x r1573441)
Modified:
lucene/dev/branches/lucene_solr_4_7/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_7/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_7/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
Modified: lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt?rev=1581168&r1=1581167&r2=1581168&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/CHANGES.txt Tue Mar 25 00:54:39 2014
@@ -84,6 +84,10 @@ Bug Fixes
* SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis
when calculating elapsed time. (Mark Miller, Ramkumar Aiyengar)
+* SOLR-5760: ConcurrentUpdateSolrServer has a blockUntilFinished call when
+ streamDeletes is true that should be tucked into the if statement below it.
+ (Mark Miller, Gregory Chanan)
+
================== 4.7.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/lucene_solr_4_7/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1581168&r1=1581167&r2=1581168&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Tue Mar 25 00:54:39 2014
@@ -283,8 +283,8 @@ public class ConcurrentUpdateSolrServer
if ((req.getDocuments() == null || req.getDocuments().isEmpty())
&& (req.getDeleteById() == null || req.getDeleteById().isEmpty())
&& (req.getDeleteByIdMap() == null || req.getDeleteByIdMap().isEmpty())) {
- blockUntilFinished();
if (req.getDeleteQuery() == null) {
+ blockUntilFinished();
return server.request(request);
}
}