lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1470198 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Date Sat, 20 Apr 2013 17:16:26 GMT
Author: markrmiller
Date: Sat Apr 20 17:16:25 2013
New Revision: 1470198

URL: http://svn.apache.org/r1470198
Log:
don't return in a finally block

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1470198&r1=1470197&r2=1470198&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
(original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Sat Apr 20 17:16:25 2013
@@ -203,17 +203,17 @@ public class OverseerCollectionProcessor
             + operation);
       }
 
-    } catch (Exception ex) {
+    } catch (Throwable t) {
       SolrException.log(log, "Collection " + operation + " of " + operation
-          + " failed", ex);
-      results.add("Operation " + operation + " caused exception:", ex);
+          + " failed", t);
+      results.add("Operation " + operation + " caused exception:", t);
       SimpleOrderedMap nl = new SimpleOrderedMap();
-      nl.add("msg", ex.getMessage());
-      nl.add("rspCode", ex instanceof SolrException ? ((SolrException)ex).code() : -1);
+      nl.add("msg", t.getMessage());
+      nl.add("rspCode", t instanceof SolrException ? ((SolrException)t).code() : -1);
       results.add("exception", nl);
-    } finally {
-      return new OverseerSolrResponse(results);
-    }
+    } 
+    
+    return new OverseerSolrResponse(results);
   }
 
   private void createAlias(Aliases aliases, ZkNodeProps message) {



Mime
View raw message