commit 0af102e74c9ecc1035e9f5a5b69d3a8f592f040f
author Connie Yau <conniey@microsoft.com> Tue May 24 14:14:54 2016 -0700
committer Connie Yau <conniey@microsoft.com> Tue May 24 14:14:54 2016 -0700
tree ba0ef21b08da35450ad2e0892e07a36f623c7f07
parent 2c8e4a9e889e94cc133eeaba7a63765d13e96c99

Removing duplicated Verbose method and passing it in MergeThread.ctor

src/Lucene.Net.Core/Index/TaskMergeScheduler.cs

diff --git a/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs b/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
index f43b243..dbc8e05 100644
--- a/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
+++ b/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
@@ -340,7 +340,7 @@
             var count = Interlocked.Increment(ref _mergeThreadCount);
             var name = string.Format("Lucene Merge Task #{0}", count);
 
-            return new MergeThread(name, writer, merge, writer.infoStream, _manualResetEvent, HandleMergeException);
+            return new MergeThread(name, writer, merge, writer.infoStream, Verbose(), _manualResetEvent, HandleMergeException);
         }
 
         /// <summary>
@@ -420,6 +420,7 @@
             private readonly InfoStream _logger;
             private readonly IndexWriter _writer;
             private readonly MergePolicy.OneMerge _startingMerge;
+            private readonly bool _isLoggingEnabled;
 
             private Task _task;
             private MergePolicy.OneMerge _runningMerge;
@@ -428,7 +429,8 @@
 
             /// <summary>
             /// Sole constructor. </summary>
-            public MergeThread(string name, IndexWriter writer, MergePolicy.OneMerge startMerge, InfoStream logger,
+            public MergeThread(string name, IndexWriter writer, MergePolicy.OneMerge startMerge,
+                InfoStream logger, bool isLoggingEnabled,
                 ManualResetEventSlim resetEvent, Action<Exception> exceptionHandler)
             {
                 Name = name;
@@ -436,18 +438,11 @@
                 _writer = writer;
                 _startingMerge = startMerge;
                 _logger = logger;
+                _isLoggingEnabled = isLoggingEnabled;
                 _resetEvent = resetEvent;
                 _exceptionHandler = exceptionHandler;
             }
 
-            private bool IsLoggingEnabled
-            {
-                get
-                {
-                    return _logger != null && _logger.IsEnabled(COMPONENT_NAME);
-                }
-            }
-
             public string Name { get; private set; }
 
             public Task Instance
@@ -562,7 +557,7 @@
 
                 try
                 {
-                    if (IsLoggingEnabled)
+                    if (_isLoggingEnabled)
                     {
                         _logger.Message(COMPONENT_NAME, "  merge thread: start");
                     }
@@ -583,7 +578,7 @@
 
                         if (merge != null)
                         {
-                            if (IsLoggingEnabled)
+                            if (_isLoggingEnabled)
                             {
                                 _logger.Message(COMPONENT_NAME, "  merge thread: do another merge " + _writer.SegString(merge.Segments));
                             }
@@ -594,7 +589,7 @@
                         }
                     }
 
-                    if (IsLoggingEnabled)
+                    if (_isLoggingEnabled)
                     {
                         _logger.Message(COMPONENT_NAME, "  merge thread: done");
                     }