You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by no...@apache.org on 2009/08/19 19:33:52 UTC

svn commit: r805899 - /lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java

Author: noble
Date: Wed Aug 19 17:33:52 2009
New Revision: 805899

URL: http://svn.apache.org/viewvc?rev=805899&view=rev
Log:
SOLR-1275 the last commit was failing the test.

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

Modified: lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=805899&r1=805898&r2=805899&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Aug 19 17:33:52 2009
@@ -383,10 +383,9 @@
 
     if (cmd.optimize) {
       optimizeCommands.incrementAndGet();
-    } else if (cmd.expungeDeletes) {
-      expungeDeleteCommands.incrementAndGet();
     } else {
       commitCommands.incrementAndGet();
+      if (cmd.expungeDeletes) expungeDeleteCommands.incrementAndGet();
     }
 
     Future[] waitSearcher = null;
@@ -406,6 +405,8 @@
         openWriter();
         writer.expungeDeletes();
       }
+      
+      closeWriter();
 
       callPostCommitCallbacks();
       if (cmd.optimize) {