mirror of https://github.com/apache/lucene.git
LUCENE-3835: MergeThread throws unchecked exceptions from toString().
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1295069 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b9e9ef7ccc
commit
651a236696
|
@ -491,14 +491,14 @@ public class ConcurrentMergeScheduler extends MergeScheduler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
MergePolicy.OneMerge merge = getRunningMerge();
|
|
||||||
if (merge == null) {
|
|
||||||
merge = startMerge;
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
|
MergePolicy.OneMerge merge = getRunningMerge();
|
||||||
|
if (merge == null) {
|
||||||
|
merge = startMerge;
|
||||||
|
}
|
||||||
return "merge thread: " + tWriter.segString(merge.segments);
|
return "merge thread: " + tWriter.segString(merge.segments);
|
||||||
} catch (IOException ioe) {
|
} catch (Throwable e) {
|
||||||
throw new RuntimeException(ioe);
|
return "merge thread: " + e.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue