From ed975f1577591631e770d37ec2183641f7fc63a1 Mon Sep 17 00:00:00 2001
From: Noble Paul <noble@apache.org>
Date: Mon, 4 May 2015 16:46:43 +0000
Subject: [PATCH] SOLR-6220: use closeable in try block

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1677635 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/solr/cloud/rule/SnitchContext.java    | 8 +++++---
 .../solr/client/solrj/request/GenericSolrRequest.java     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java b/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java
index fab0d65190b..007c8fc985e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java
@@ -107,9 +107,11 @@ public class SnitchContext implements RemoteCallback {
   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;
+    }
   }
 
 
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java
index e447ad5334a..9c9f7d49b4c 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java
@@ -48,7 +48,7 @@ public class GenericSolrRequest extends SolrRequest<SimpleSolrResponse> {
 
   @Override
   public Collection<ContentStream> getContentStreams() throws IOException {
-    return null;
+    return contentStreams;
   }
 
   @Override