Apache Solr open-source search software
SOLR-17417: Remove unecessary code in PKIAuthPlugin and HttpSolrCall
Houston Putman7ef2c0ef3660
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex b7e45292d5d..3b428a105b5 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -273,6 +273,8 @@ Bug FixesShard splits and concurrent/large collection backup/restore performance was serial. UpdateLogreplay was a little suboptimal in thread usage too. (Pierre Salagnac, Hakan Özler, David Smiley)+* SOLR-17417: Remove unnecessary code in PKIAuthPlugin and HttpSolrCall (Houston Putman, janhoy, Liu Huajin)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.javaindex 0b966e5419a..b1f6e6b6eed 100644--- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java+++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java@@ -141,15 +141,6 @@ public class PKIAuthenticationPlugin extends AuthenticationPlugin// Getting the received time must be the first thing we do, processing the request can take timelong receivedTime = System.currentTimeMillis();- String requestURI = request.getRequestURI();- if (requestURI.endsWith(PublicKeyHandler.PATH)) {- assert false : "Should already be handled by SolrDispatchFilter.authenticateRequest";-- numPassThrough.inc();- filterChain.doFilter(request, response);- return true;- }-PKIHeaderData headerData = null;String headerV2 = request.getHeader(HEADER_V2);String headerV1 = request.getHeader(HEADER);diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.javaindex 5a84b2cc45c..9a8fcd400b6 100644--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java@@ -218,13 +218,6 @@ public class HttpSolrCall {queryParams = SolrRequestParsers.parseQueryString(req.getQueryString());- // unused feature ?- int idx = path.indexOf(':');- if (idx > 0) {- // save the portion after the ':' for a 'handler' path parameter- path = path.substring(0, idx);- }-// Check for container handlershandler = cores.getRequestHandler(path);if (handler != null) {@@ -236,7 +229,7 @@ public class HttpSolrCall {}// Parse a core or collection name from the path and attempt to see if it's a core name- idx = path.indexOf('/', 1);+ int idx = path.indexOf('/', 1);if (idx > 1) {origCorename = path.substring(1, idx);