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

SOLR-8578: Fully consume proxy requests and move CHANGES entry to 6.0.

This commit is contained in:
markrmiller 2016-02-16 13:16:02 -05:00
parent 13dda5debb
commit a40118c9df
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solr/CHANGES.txt
View File

@ -169,6 +169,9 @@ Bug Fixes
* SOLR-8527: Improve JdbcTest to cleanup properly on failures (Kevin Risden, Joel Bernstein)
* SOLR-8578: Successful or not, requests are not always fully consumed by Solrj clients and we
count on HttpClient or the JVM. (Mark Miller)
Optimizations
----------------------
* SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been
@ -533,9 +536,6 @@ Bug Fixes
distributed queries (Jessica Cheng Mallet via Erick Erickson)
* SOLR-8551: Make collection deletion more robust. (Mark Miller)
* SOLR-8578: Successful or not, requests are not always fully consumed by Solrj clients and we
count on HttpClient or the JVM. (Mark Miller)
Optimizations
----------------------

3
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
View File

@ -55,7 +55,6 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.InputStreamEntity;
import org.apache.http.util.EntityUtils;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
@ -587,7 +586,7 @@ public class HttpSolrCall {
SolrException.ErrorCode.SERVER_ERROR,
"Error trying to proxy request for url: " + coreUrl, e));
} finally {
EntityUtils.consumeQuietly(httpEntity);
Utils.consumeFully(httpEntity);
}
}