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/12/07 20:26:40 UTC
svn commit: r1211607 -
/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Author: markrmiller
Date: Wed Dec 7 19:26:40 2011
New Revision: 1211607
URL: http://svn.apache.org/viewvc?rev=1211607&view=rev
Log:
formatting...
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1211607&r1=1211606&r2=1211607&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Dec 7 19:26:40 2011
@@ -341,23 +341,23 @@ public class DirectUpdateHandler2 extend
}
- if (cmd.softCommit) {
- // ulog.preSoftCommit();
- synchronized (this) {
- ulog.preSoftCommit(cmd);
- core.getSearcher(true,false,waitSearcher, true);
- ulog.postSoftCommit(cmd);
- }
- // ulog.postSoftCommit();
- } else {
- synchronized (this) {
- ulog.preSoftCommit(cmd);
- core.getSearcher(true,false,waitSearcher);
- ulog.postSoftCommit(cmd);
- }
- ulog.postCommit(cmd); // postCommit currently means new searcher has also been opened
+ if (cmd.softCommit) {
+ // ulog.preSoftCommit();
+ synchronized (this) {
+ ulog.preSoftCommit(cmd);
+ core.getSearcher(true, false, waitSearcher, true);
+ ulog.postSoftCommit(cmd);
}
-
+ // ulog.postSoftCommit();
+ } else {
+ synchronized (this) {
+ ulog.preSoftCommit(cmd);
+ core.getSearcher(true, false, waitSearcher);
+ ulog.postSoftCommit(cmd);
+ }
+ ulog.postCommit(cmd); // postCommit currently means new searcher has
+ // also been opened
+ }
// reset commit tracking