You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/08/10 20:58:21 UTC
svn commit: r1156314 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Author: simonw
Date: Wed Aug 10 18:58:21 2011
New Revision: 1156314
URL: http://svn.apache.org/viewvc?rev=1156314&view=rev
Log:
LUCENE-3372: decrement SIS files if preparecommit fails
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1156314&r1=1156313&r2=1156314&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java Wed Aug 10 18:58:21 2011
@@ -2790,9 +2790,17 @@ public class IndexWriter implements Clos
} catch (OutOfMemoryError oom) {
handleOOM(oom, "prepareCommit");
}
-
- if (anySegmentsFlushed) {
- maybeMerge();
+
+ boolean success = false;
+ try {
+ if (anySegmentsFlushed) {
+ maybeMerge();
+ }
+ success = true;
+ } finally {
+ if (!success) {
+ deleter.decRef(toCommit);
+ }
}
startCommit(toCommit, commitUserData);