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 2016/09/07 09:57:17 UTC
[29/50] [abbrv] lucene-solr:apiv2: SOLR-9188: Trying revert a change
and fix the unexpected IOException in jenkins failure.
SOLR-9188: Trying revert a change and fix the unexpected IOException in jenkins failure.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/757c245b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/757c245b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/757c245b
Branch: refs/heads/apiv2
Commit: 757c245bee057b899107be113fcfc0e4cce3b4a2
Parents: 0ed8c2a
Author: Noble Paul <no...@apache.org>
Authored: Mon Aug 29 13:07:03 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Mon Aug 29 13:07:03 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/solr/servlet/SolrDispatchFilter.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/757c245b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 8c792e9..17cd6b5 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -299,10 +299,15 @@ public class SolrDispatchFilter extends BaseSolrFilter {
boolean requestContinues = false;
final AtomicBoolean isAuthenticated = new AtomicBoolean(false);
AuthenticationPlugin authenticationPlugin = cores.getAuthenticationPlugin();
- if (authenticationPlugin == null ||
- PKIAuthenticationPlugin.PATH.equals(((HttpServletRequest)request).getPathInfo())) {
+ if (authenticationPlugin == null) {
return true;
} else {
+ try {
+ if (PKIAuthenticationPlugin.PATH.equals(((HttpServletRequest) request).getPathInfo())) return true;
+ } catch (Exception e) {
+ log.error("Unexpected error ", e);
+ }
+
//special case when solr is securing inter-node requests
String header = ((HttpServletRequest) request).getHeader(PKIAuthenticationPlugin.HEADER);
if (header != null && cores.getPkiAuthenticationPlugin() != null)