You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/04/30 23:00:03 UTC
svn commit: r1677072 -
/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
Author: shaie
Date: Thu Apr 30 21:00:03 2015
New Revision: 1677072
URL: http://svn.apache.org/r1677072
Log:
SOLR-7486: HttpSolrClient.shutdown() should call close() and not vice versa
Modified:
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java?rev=1677072&r1=1677071&r2=1677072&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java Thu Apr 30 21:00:03 2015
@@ -695,14 +695,18 @@ public class HttpSolrClient extends Solr
*/
@Override
public void close() throws IOException {
- shutdown();
+ if (httpClient != null && internalClient) {
+ HttpClientUtil.close(httpClient);
+ }
}
@Override
@Deprecated
public void shutdown() {
- if (httpClient != null && internalClient) {
- HttpClientUtil.close(httpClient);
+ try {
+ close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
}