You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2016/02/16 19:16:20 UTC
lucene-solr git commit: SOLR-8578: Fully consume proxy requests and
move CHANGES entry to 6.0.
Repository: lucene-solr
Updated Branches:
refs/heads/master 13dda5deb -> a40118c9d
SOLR-8578: Fully consume proxy requests and move CHANGES entry to 6.0.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a40118c9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a40118c9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a40118c9
Branch: refs/heads/master
Commit: a40118c9df0db1deaee9ea0d7e2ad399704ff5b3
Parents: 13dda5d
Author: markrmiller <ma...@apache.org>
Authored: Tue Feb 16 13:16:02 2016 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Tue Feb 16 13:16:02 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 6 +++---
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a40118c9/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7584f45..828727f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a40118c9/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index fa9d92a..7227a8b 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -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);
}
}