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:15:26 UTC
svn commit: r1060441 -
/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
Author: mikemccand
Date: Tue Jan 18 16:15:26 2011
New Revision: 1060441
URL: http://svn.apache.org/viewvc?rev=1060441&view=rev
Log:
revert accidental commit
Modified:
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1060441&r1=1060440&r2=1060441&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Tue Jan 18 16:15:26 2011
@@ -283,9 +283,7 @@ public class ConcurrentMergeScheduler ex
protected synchronized int mergeThreadCount() {
int count = 0;
for (MergeThread mt : mergeThreads) {
- if (mt.isAlive() && mt.getCurrentMerge() != null) {
- count++;
- }
+ if (mt.isAlive()) count++;
}
return count;
}
@@ -340,16 +338,10 @@ public class ConcurrentMergeScheduler ex
while (mergeThreadCount() >= maxMergeCount) {
startStallTime = System.currentTimeMillis();
if (verbose()) {
- message(" too many merges (" + mergeThreadCount() + " vs " + maxMergeCount + "); stalling...");
+ message(" too many merges; stalling...");
}
- // NOTE: in theory we should be able to do
- // simply wait(), but, as a defense against
- // thread timing hazards where notifyAll()
- // fails to be called, we wait for at most 1
- // second and then re-check:
try {
- // nocommit
- wait(10000000);
+ wait();
} catch (InterruptedException ie) {
throw new ThreadInterruptedException(ie);
}
@@ -585,5 +577,4 @@ public class ConcurrentMergeScheduler ex
public static void setTestMode() {
allInstances = new ArrayList<ConcurrentMergeScheduler>();
}
-
}