You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/01/18 17:12:00 UTC
svn commit: r1060437 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
Author: mikemccand
Date: Tue Jan 18 16:12:00 2011
New Revision: 1060437
URL: http://svn.apache.org/viewvc?rev=1060437&view=rev
Log:
LUCENE-2755: fix accidental commit that caused CMS to deadlock
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1060437&r1=1060436&r2=1060437&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Tue Jan 18 16:12:00 2011
@@ -274,7 +274,9 @@ public class ConcurrentMergeScheduler ex
protected synchronized int mergeThreadCount() {
int count = 0;
for (MergeThread mt : mergeThreads) {
- if (mt.isAlive()) count++;
+ if (mt.isAlive() && mt.getCurrentMerge() != null) {
+ count++;
+ }
}
return count;
}