You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/05/08 10:20:17 UTC
lucene-solr:master: SOLR-10630: HttpSolrCall.getAuthCtx().new
AuthorizationContext() {...}.getParams() sometimes throws
java.lang.NullPointerException
Repository: lucene-solr
Updated Branches:
refs/heads/master 20c488681 -> 54061ed4a
SOLR-10630: HttpSolrCall.getAuthCtx().new AuthorizationContext() {...}.getParams() sometimes throws java.lang.NullPointerException
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/54061ed4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/54061ed4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/54061ed4
Branch: refs/heads/master
Commit: 54061ed4a6c1ed9b60e08056577fac702c6816bd
Parents: 20c4886
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon May 8 15:50:10 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon May 8 15:50:10 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54061ed4/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 118d629..f39c0b9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -319,6 +319,9 @@ Bug Fixes
* SOLR-8149: Admin UI - Plugins / Stats - active item is now highlighted (Labuzov Dmitriy via janhoy)
+* SOLR-10630: HttpSolrCall.getAuthCtx().new AuthorizationContext() {...}.getParams()
+ sometimes throws java.lang.NullPointerException (hu xiaodong via shalin)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54061ed4/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 4f6bae0..4318621 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -1028,7 +1028,7 @@ public class HttpSolrCall {
return new AuthorizationContext() {
@Override
public SolrParams getParams() {
- return solrReq.getParams();
+ return null == solrReq ? null : solrReq.getParams();
}
@Override
@@ -1081,7 +1081,7 @@ public class HttpSolrCall {
response.delete(response.length() - 1, response.length());
response.append("], Path: [").append(resource).append("]");
- response.append(" path : ").append(path).append(" params :").append(solrReq.getParams());
+ response.append(" path : ").append(path).append(" params :").append(getParams());
return response.toString();
}