You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/04/20 19:18:31 UTC
svn commit: r1470199 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Author: markrmiller
Date: Sat Apr 20 17:18:30 2013
New Revision: 1470199
URL: http://svn.apache.org/r1470199
Log:
don't return in a finally block
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1470199&r1=1470198&r2=1470199&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Sat Apr 20 17:18:30 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) {