diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 118d6295400..f39c0b9948f 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 ---------------------- 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 4f6bae0aead..4318621af6e 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(); }