You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/01/25 03:44:03 UTC
[19/50] [abbrv] lucenenet git commit:
Lucene.Net.Tests.Core.TestConcurrentMergeScheduler.ConcurrentMergeSchedulerAnonymousInnerClassHelper:
renamed MaxMergeCount camelCase because of a conflict with a property with
the same name
Lucene.Net.Tests.Core.TestConcurrentMergeScheduler.ConcurrentMergeSchedulerAnonymousInnerClassHelper: renamed MaxMergeCount camelCase because of a conflict with a property with the same name
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9f3fa7a8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9f3fa7a8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9f3fa7a8
Branch: refs/heads/api-work
Commit: 9f3fa7a821bea13348de97e4de9324dced95b4a9
Parents: c1c68dc
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Jan 25 05:00:24 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Jan 25 09:34:47 2017 +0700
----------------------------------------------------------------------
.../core/Index/TestConcurrentMergeScheduler.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9f3fa7a8/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
index 401b1fd..1cde70b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestConcurrentMergeScheduler.cs
@@ -327,7 +327,7 @@ namespace Lucene.Net.Index
{
private readonly TestConcurrentMergeScheduler OuterInstance;
- private int MaxMergeCount;
+ private int maxMergeCount;
private CountdownEvent EnoughMergesWaiting;
private AtomicInteger RunningMergeCount;
private AtomicBoolean Failed;
@@ -335,7 +335,7 @@ namespace Lucene.Net.Index
public ConcurrentMergeSchedulerAnonymousInnerClassHelper(TestConcurrentMergeScheduler outerInstance, int maxMergeCount, CountdownEvent enoughMergesWaiting, AtomicInteger runningMergeCount, AtomicBoolean failed)
{
this.OuterInstance = outerInstance;
- this.MaxMergeCount = maxMergeCount;
+ this.maxMergeCount = maxMergeCount;
this.EnoughMergesWaiting = enoughMergesWaiting;
this.RunningMergeCount = runningMergeCount;
this.Failed = failed;
@@ -350,7 +350,7 @@ namespace Lucene.Net.Index
int count = RunningMergeCount.IncrementAndGet();
try
{
- Assert.IsTrue(count <= MaxMergeCount, "count=" + count + " vs maxMergeCount=" + MaxMergeCount);
+ Assert.IsTrue(count <= maxMergeCount, "count=" + count + " vs maxMergeCount=" + maxMergeCount);
EnoughMergesWaiting.Signal();
// Stall this merge until we see exactly