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

SOLR-10630: HttpSolrCall.getAuthCtx().new AuthorizationContext() {...}.getParams() sometimes throws java.lang.NullPointerException

This commit is contained in:
Shalin Shekhar Mangar 2017-05-08 15:50:10 +05:30
parent 20c4886816
commit 54061ed4a6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -319,6 +319,9 @@ Bug Fixes
* SOLR-8149: Admin UI - Plugins / Stats - active item is now highlighted (Labuzov Dmitriy via janhoy) * 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 Other Changes
---------------------- ----------------------

4
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
View File

@ -1028,7 +1028,7 @@ public class HttpSolrCall {
return new AuthorizationContext() { return new AuthorizationContext() {
@Override @Override
public SolrParams getParams() { public SolrParams getParams() {
return solrReq.getParams(); return null == solrReq ? null : solrReq.getParams();
} }
@Override @Override
@ -1081,7 +1081,7 @@ public class HttpSolrCall {
response.delete(response.length() - 1, response.length()); response.delete(response.length() - 1, response.length());
response.append("], Path: [").append(resource).append("]"); 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(); return response.toString();
} }