lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [Lucene.Net] svn commit: r1082615 - in /incubator/lucene.net/trunk/C#/src/Lucene.Net/Index: ConcurrentMergeScheduler.cs IndexWriter.cs
Date Thu, 17 Mar 2011 18:08:31 GMT
Author: digy
Date: Thu Mar 17 18:08:30 2011
New Revision: 1082615

URL: http://svn.apache.org/viewvc?rev=1082615&view=rev
Log:
[LUCENENET-399]

Modified:
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs?rev=1082615&r1=1082614&r2=1082615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs Thu Mar
17 18:08:30 2011
@@ -426,10 +426,8 @@ namespace Lucene.Net.Index
 					lock (Enclosing_Instance)
 					{
 						System.Threading.Monitor.PulseAll(Enclosing_Instance);
-						System.Boolean tempBoolean;
-						tempBoolean = Enclosing_Instance.mergeThreads.Contains(this);
 						Enclosing_Instance.mergeThreads.Remove(this);
-						bool removed = tempBoolean;
+                        bool removed = !Enclosing_Instance.mergeThreads.Contains(this);
 						System.Diagnostics.Debug.Assert(removed);
 					}
 				}

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexWriter.cs?rev=1082615&r1=1082614&r2=1082615&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs Thu Mar 17 18:08:30
2011
@@ -639,7 +639,7 @@ namespace Lucene.Net.Index
                             enclosingInstance.deleter.Checkpoint(enclosingInstance.segmentInfos,
false);
 						}
 
-                        readerMap.Remove(iter.Current); // iter.remove(); DIGY
+                        readerMap.Remove(ent.Key); 
 						
 						// NOTE: it is allowed that this decRef does not
 						// actually close the SR; this can happen when a



Mime
View raw message