Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2755: fix accidental commit that caused CMS to deadlock 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1060437 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2011-01-18 16:12:00 +00:00
parent 78e306799d
commit 43fe48710b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
View File

@ -274,7 +274,9 @@ public class ConcurrentMergeScheduler extends MergeScheduler {
protected synchronized int mergeThreadCount() {
int count = 0;
for (MergeThread mt : mergeThreads) {
if (mt.isAlive()) count++;
if (mt.isAlive() && mt.getCurrentMerge() != null) {
count++;
}
}
return count;
}