You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/07/24 08:20:54 UTC
svn commit: r1364909 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: uschindler
Date: Tue Jul 24 06:20:53 2012
New Revision: 1364909
URL: http://svn.apache.org/viewvc?rev=1364909&view=rev
Log:
Merged revision(s) 1364908 from lucene/dev/trunk:
LUCENE-4245: better record interruption
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1364909&r1=1364908&r2=1364909&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Tue Jul 24 06:20:53 2012
@@ -872,7 +872,7 @@ public class IndexWriter implements Clos
}
private void closeInternal(boolean waitForMerges, boolean doFlush) throws IOException {
- boolean interrupted = Thread.interrupted();
+ boolean interrupted = false;
try {
if (pendingCommit != null) {
@@ -896,6 +896,7 @@ public class IndexWriter implements Clos
} finally {
// clean up merge scheduler in all cases, although flushing may have failed:
+ interrupted = Thread.interrupted();
if (waitForMerges) {
try {