You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/05/04 18:46:43 UTC
svn commit: r1677635 - in /lucene/dev/trunk/solr:
core/src/java/org/apache/solr/cloud/rule/SnitchContext.java
solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java
Author: noble
Date: Mon May 4 16:46:43 2015
New Revision: 1677635
URL: http://svn.apache.org/r1677635
Log:
SOLR-6220: use closeable in try block
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java?rev=1677635&r1=1677634&r2=1677635&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java Mon May 4 16:46:43 2015
@@ -107,9 +107,11 @@ public class SnitchContext implements Re
public SimpleSolrResponse invoke(UpdateShardHandler shardHandler, final String url, String path, SolrParams params)
throws IOException, SolrServerException {
GenericSolrRequest request = new GenericSolrRequest(SolrRequest.METHOD.GET, path, params);
- NamedList<Object> rsp = new HttpSolrClient(url, shardHandler.getHttpClient(), new BinaryResponseParser()).request(request);
- request.response.nl = rsp;
- return request.response;
+ try (HttpSolrClient client = new HttpSolrClient(url, shardHandler.getHttpClient(), new BinaryResponseParser())) {
+ NamedList<Object> rsp = client.request(request);
+ request.response.nl = rsp;
+ return request.response;
+ }
}
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java?rev=1677635&r1=1677634&r2=1677635&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java Mon May 4 16:46:43 2015
@@ -48,7 +48,7 @@ public class GenericSolrRequest extends
@Override
public Collection<ContentStream> getContentStreams() throws IOException {
- return null;
+ return contentStreams;
}
@Override