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

SOLR-5452: Parse params correctly. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1543097 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-11-18 18:19:26 +00:00
parent 74deac93f8
commit b10061bf11
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,9 +314,9 @@ public class SolrDispatchFilter implements Filter
// if we couldn't find it locally, look on other nodes // if we couldn't find it locally, look on other nodes
if (core == null && idx > 0) { if (core == null && idx > 0) {
String coreUrl = getRemotCoreUrl(cores, corename, origCorename); String coreUrl = getRemotCoreUrl(cores, corename, origCorename);
Map<String,String[]> params = req.getParameterMap();
// don't proxy for internal update requests // don't proxy for internal update requests
if (coreUrl != null && (params == null || !params.containsKey(DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM))) { solrReq = SolrRequestParsers.DEFAULT.parse(null,path, req);
if (coreUrl != null && solrReq.getParams().get(DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM) == null) {
path = path.substring( idx ); path = path.substring( idx );
remoteQuery(coreUrl + path, req, solrReq, resp); remoteQuery(coreUrl + path, req, solrReq, resp);
return; return;
@ -500,9 +500,9 @@ public class SolrDispatchFilter implements Filter
con.setRequestMethod(req.getMethod()); con.setRequestMethod(req.getMethod());
con.setUseCaches(false); con.setUseCaches(false);
boolean isPostRequest = "POST".equals(req.getMethod()); boolean isPostOrPutRequest = "POST".equals(req.getMethod()) || "PUT".equals(req.getMethod());
if (isPostRequest) { if (isPostOrPutRequest) {
con.setDoOutput(true); con.setDoOutput(true);
} }
con.setDoInput(true); con.setDoInput(true);
@ -515,7 +515,7 @@ public class SolrDispatchFilter implements Filter
InputStream is; InputStream is;
OutputStream os; OutputStream os;
if (isPostRequest) { if (isPostOrPutRequest) {
is = req.getInputStream(); is = req.getInputStream();
os = con.getOutputStream(); // side effect: method is switched to POST os = con.getOutputStream(); // side effect: method is switched to POST
try { try {