You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/02/29 12:44:03 UTC

svn commit: r1295069 - /lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java

Author: dweiss
Date: Wed Feb 29 11:44:03 2012
New Revision: 1295069

URL: http://svn.apache.org/viewvc?rev=1295069&view=rev
Log:
LUCENE-3835: MergeThread throws unchecked exceptions from toString().

Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1295069&r1=1295068&r2=1295069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Wed Feb 29 11:44:03 2012
@@ -491,14 +491,14 @@ public class ConcurrentMergeScheduler ex
 
     @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();
       }
     }
   }