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

SOLR-4716,SOLR-4584: SolrCloud request proxying does not work on Tomcat and perhaps other non Jetty containers. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1469672 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-04-19 03:30:35 +00:00
parent 34417d7bf1
commit 40717e3439
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -222,6 +222,9 @@ Bug Fixes
* SOLR-4661: Admin UI Replication details now correctly displays the current * SOLR-4661: Admin UI Replication details now correctly displays the current
replicable generation/version of the master. (hossman) replicable generation/version of the master. (hossman)
* SOLR-4716,SOLR-4584: SolrCloud request proxying does not work on Tomcat and
perhaps other non Jetty containers. (Po Rui, Yago Riveiro via Mark Miller)
Optimizations Optimizations
---------------------- ----------------------

2
solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
View File

@ -448,6 +448,7 @@ public class SolrDispatchFilter implements Filter
os = con.getOutputStream(); // side effect: method is switched to POST os = con.getOutputStream(); // side effect: method is switched to POST
try { try {
IOUtils.copyLarge(is, os); IOUtils.copyLarge(is, os);
os.flush();
} finally { } finally {
IOUtils.closeQuietly(os); IOUtils.closeQuietly(os);
IOUtils.closeQuietly(is); // TODO: I thought we weren't supposed to explicitly close servlet streams IOUtils.closeQuietly(is); // TODO: I thought we weren't supposed to explicitly close servlet streams
@ -470,6 +471,7 @@ public class SolrDispatchFilter implements Filter
os = resp.getOutputStream(); os = resp.getOutputStream();
try { try {
IOUtils.copyLarge(is, os); IOUtils.copyLarge(is, os);
os.flush();
} finally { } finally {
IOUtils.closeQuietly(os); // TODO: I thought we weren't supposed to explicitly close servlet streams IOUtils.closeQuietly(os); // TODO: I thought we weren't supposed to explicitly close servlet streams
IOUtils.closeQuietly(is); IOUtils.closeQuietly(is);