You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/06/12 08:31:22 UTC
lucene-solr:master: SOLR-10870: SolrRequestParsers does unnecessary
check for /config prefix
Repository: lucene-solr
Updated Branches:
refs/heads/master 41d12df6d -> e11eb63f6
SOLR-10870: SolrRequestParsers does unnecessary check for /config prefix
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e11eb63f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e11eb63f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e11eb63f
Branch: refs/heads/master
Commit: e11eb63f60acf78278ba88cb777b17bb1daba314
Parents: 41d12df
Author: Noble Paul <no...@apache.org>
Authored: Mon Jun 12 18:01:09 2017 +0930
Committer: Noble Paul <no...@apache.org>
Committed: Mon Jun 12 18:01:09 2017 +0930
----------------------------------------------------------------------
.../org/apache/solr/servlet/SolrRequestParsers.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e11eb63f/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 9aae8e9..1300bd9 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -16,8 +16,7 @@
*/
package org.apache.solr.servlet;
-import static org.apache.solr.common.params.CommonParams.PATH;
-
+import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -39,8 +38,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
@@ -53,6 +50,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.CommandOperation;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.FastInputStream;
@@ -61,10 +59,11 @@ import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
-import org.apache.solr.common.util.CommandOperation;
import org.apache.solr.util.RTimerTree;
import org.apache.solr.util.SolrFileCleaningTracker;
+import static org.apache.solr.common.params.CommonParams.PATH;
+
public class SolrRequestParsers
{
@@ -746,10 +745,6 @@ public class SolrRequestParsers
if (idx >= 0 && uri.endsWith("/schema") || uri.contains("/schema/")) {
restletPath = true;
}
- idx = uri.indexOf("/config");
- if (idx >= 0 && uri.endsWith("/config") || uri.contains("/config/")) {
- restletPath = true;
- }
if (restletPath) {
return parseQueryString(req.getQueryString());