From 86d5dd652937ec45dd4cd191e6d42c990d0cbe0c Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Tue, 1 Oct 2013 13:02:35 +0000 Subject: [PATCH] LUCENE-5189: s/doApplyAllDeletes/getAndResetApplyAllDeletes/ git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1528077 13f79535-47bb-0310-9956-ffa450edef68 --- .../core/src/java/org/apache/lucene/index/DocumentsWriter.java | 2 +- .../org/apache/lucene/index/DocumentsWriterFlushControl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java index def6f1276b2..b8ba7d6ebcd 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java @@ -170,7 +170,7 @@ final class DocumentsWriter { } private final boolean applyAllDeletes(DocumentsWriterDeleteQueue deleteQueue) throws IOException { - if (flushControl.doApplyAllDeletes()) { + if (flushControl.getAndResetApplyAllDeletes()) { if (deleteQueue != null && !flushControl.isFullFlush()) { ticketQueue.addDeletes(deleteQueue); } diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java index dcadc20f2bb..c6da865daa8 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java @@ -429,7 +429,7 @@ final class DocumentsWriterFlushControl { return flushingWriters.size(); } - public boolean doApplyAllDeletes() { + public boolean getAndResetApplyAllDeletes() { return flushDeletes.getAndSet(false); }