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 2011/08/24 22:23:57 UTC

svn commit: r1161265 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java

Author: markrmiller
Date: Wed Aug 24 20:23:57 2011
New Revision: 1161265

URL: http://svn.apache.org/viewvc?rev=1161265&view=rev
Log:
SOLR-2565: same as the addDoc bug, deletes are not triggering soft commits if hard auto commit by time is also configured

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1161265&r1=1161264&r2=1161265&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Aug 24 20:23:57 2011
@@ -187,7 +187,9 @@ public class DirectUpdateHandler2 extend
 
     if (commitTracker.getTimeUpperBound() > 0) {
       commitTracker.scheduleCommitWithin(commitTracker.getTimeUpperBound());
-    } else if (softCommitTracker.getTimeUpperBound() > 0) {
+    } 
+    
+    if (softCommitTracker.getTimeUpperBound() > 0) {
       softCommitTracker.scheduleCommitWithin(softCommitTracker.getTimeUpperBound());
     }
   }
@@ -219,7 +221,9 @@ public class DirectUpdateHandler2 extend
       
       if (commitTracker.getTimeUpperBound() > 0) {
         commitTracker.scheduleCommitWithin(commitTracker.getTimeUpperBound());
-      } else if (softCommitTracker.getTimeUpperBound()> 0) {
+      } 
+      
+      if (softCommitTracker.getTimeUpperBound()> 0) {
         softCommitTracker.scheduleCommitWithin(softCommitTracker.getTimeUpperBound());
       }