From 651a23669603bf8f6cad72ca75ddb9b2bebac656 Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dweiss@apache.org>
Date: Wed, 29 Feb 2012 11:44:03 +0000
Subject: [PATCH] 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
---
 .../lucene/index/ConcurrentMergeScheduler.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
index 12d012f0f89..44fe5fac0e3 100644
--- a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
+++ b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
@@ -491,14 +491,14 @@ public class ConcurrentMergeScheduler extends MergeScheduler {
 
     @Override
     public String toString() {
-      MergePolicy.OneMerge merge = getRunningMerge();
-      if (merge == null) {
-        merge = startMerge;
-      }
       try {
+        MergePolicy.OneMerge merge = getRunningMerge();
+        if (merge == null) {
+          merge = startMerge;
+        }
         return "merge thread: " + tWriter.segString(merge.segments);
-      } catch (IOException ioe) {
-        throw new RuntimeException(ioe);
+      } catch (Throwable e) {
+        return "merge thread: " + e.toString();
       }
     }
   }