From a99d8cd53e6f85dd1f5e2434a4673290dc6f4e56 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 24 Jan 2025 20:20:16 -0500 Subject: [PATCH] Rename variable in ConcurrentMergeScheduler to avoid clashing with method of the same name Signed-off-by: Craig Perkins --- .../org/apache/lucene/index/ConcurrentMergeScheduler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java index b5f869c39f0c..1a390d6606c6 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java @@ -87,7 +87,7 @@ public class ConcurrentMergeScheduler extends MergeScheduler { private int maxMergeCount = AUTO_DETECT_MERGES_AND_THREADS; /** How many {@link MergeThread}s have kicked off (this is use to name them). */ - protected int mergeThreadCount; + protected int mergeThreadCounter; /** Floor for IO write rate limit (we will never go any lower than this) */ private static final double MIN_MERGE_MB_PER_SEC = 5.0; @@ -673,7 +673,7 @@ protected synchronized MergeThread getMergeThread(MergeSource mergeSource, OneMe throws IOException { final MergeThread thread = new MergeThread(mergeSource, merge); thread.setDaemon(true); - thread.setName("Lucene Merge Thread #" + mergeThreadCount++); + thread.setName("Lucene Merge Thread #" + mergeThreadCounter++); return thread; }