Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5874: Unsafe cast in CloudSolrServer's RouteException. Change RouteException to handle Throwable rather than Exception. 

SOLR-5899: CloudSolrServer's RouteResponse and RouteException should be publicly accessible.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1580550 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-03-23 17:46:23 +00:00
parent ef3973c589
commit 76ab559958
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solr/CHANGES.txt
View File

@ -194,6 +194,12 @@ Bug Fixes
* SOLR-5893: On restarting overseer designate , move itself to front of the queue (Noble Paul) * SOLR-5893: On restarting overseer designate , move itself to front of the queue (Noble Paul)
* SOLR-5874: Unsafe cast in CloudSolrServer's RouteException. Change
RouteException to handle Throwable rather than Exception.
(Mark Miller, David Arthur)
* SOLR-5899: CloudSolrServer's RouteResponse and RouteException should be
publicly accessible. (Mark Miller, shalin)
Optimizations Optimizations
---------------------- ----------------------

20
solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
View File

@ -311,8 +311,8 @@ public class CloudSolrServer extends SolrServer {
return null; return null;
} }
NamedList exceptions = new NamedList(); NamedList<Throwable> exceptions = new NamedList<Throwable>();
NamedList shardResponses = new NamedList(); NamedList<NamedList> shardResponses = new NamedList<NamedList>();
Map<String, LBHttpSolrServer.Req> routes = updateRequest.getRoutes(router, col, urlMap, routableParams, this.idField); Map<String, LBHttpSolrServer.Req> routes = updateRequest.getRoutes(router, col, urlMap, routableParams, this.idField);
if (routes == null) { if (routes == null) {
@ -453,7 +453,7 @@ public class CloudSolrServer extends SolrServer {
return condensed; return condensed;
} }
class RouteResponse extends NamedList { public static class RouteResponse extends NamedList {
private NamedList routeResponses; private NamedList routeResponses;
private Map<String, LBHttpSolrServer.Req> routes; private Map<String, LBHttpSolrServer.Req> routes;
@ -475,19 +475,19 @@ public class CloudSolrServer extends SolrServer {
} }
class RouteException extends SolrException { public static class RouteException extends SolrException {
private NamedList exceptions; private NamedList<Throwable> throwables;
private Map<String, LBHttpSolrServer.Req> routes; private Map<String, LBHttpSolrServer.Req> routes;
public RouteException(ErrorCode errorCode, NamedList exceptions, Map<String, LBHttpSolrServer.Req> routes){ public RouteException(ErrorCode errorCode, NamedList<Throwable> throwables, Map<String, LBHttpSolrServer.Req> routes){
super(errorCode, ((Exception)exceptions.getVal(0)).getMessage(), (Exception)exceptions.getVal(0)); super(errorCode, throwables.getVal(0).getMessage(), throwables.getVal(0));
this.exceptions = exceptions; this.throwables = throwables;
this.routes = routes; this.routes = routes;
} }
public NamedList getExceptions() { public NamedList<Throwable> getThrowables() {
return exceptions; return throwables;
} }
public Map<String, LBHttpSolrServer.Req> getRoutes() { public Map<String, LBHttpSolrServer.Req> getRoutes() {