lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r830944 - in /lucene/solr/branches/branch-1.4: CHANGES.txt src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
Date Thu, 29 Oct 2009 13:41:17 GMT
Author: yonik
Date: Thu Oct 29 13:41:16 2009
New Revision: 830944

URL: http://svn.apache.org/viewvc?rev=830944&view=rev
Log:
SOLR-1529: many deleteByQyery in same request can cause NPE

Modified:
    lucene/solr/branches/branch-1.4/CHANGES.txt
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java

Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=830944&r1=830943&r2=830944&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Thu Oct 29 13:41:16 2009
@@ -638,6 +638,10 @@
     is attempted only once the first time an admin page is loaded.
     (hossman)
 
+75. SOLR-1529: More than 8 deleteByQuery commands in a single request
+    caused an error to be returned, although the deletes were
+    still executed.  (asmodean via yonik)
+
 Other Changes
 ----------------------
  1. Upgraded to Lucene 2.4.0 (yonik)

Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=830944&r1=830943&r2=830944&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
(original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
Thu Oct 29 13:41:16 2009
@@ -161,10 +161,10 @@
     // be logged by SolrCore
     
     // if id lists were truncated, show how many more there were
-    if (numAdds > maxNumToLog) {
+    if (adds != null && numAdds > maxNumToLog) {
       adds.add("... (" + adds.size() + " added)");
     }
-    if (numDeletes > maxNumToLog) {
+    if (deletes != null && numDeletes > maxNumToLog) {
       deletes.add("... (" + deletes.size() + " removed)");
     }
     long elapsed = rsp.getEndTime() - req.getStartTime();



Mime
View raw message