[lucene-solr] 03/49: @517 Avoid NPE in qos filter.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 05df87b86afa0ffa64ee3dfb006fcdb8b5762307
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Aug 11 20:56:17 2020 -0500

    @517 Avoid NPE in qos filter.
---
 solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java
index 8a1c2b4..76b5ea7 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrQoSFilter.java
@@ -60,7 +60,8 @@ public class SolrQoSFilter extends QoSFilter {
       throws IOException, ServletException {
     HttpServletRequest req = (HttpServletRequest) request;
     String source = req.getHeader(QoSParams.REQUEST_SOURCE);
-    if (!req.getPathInfo().startsWith("/img/") && (source == null || !source.equals(QoSParams.INTERNAL))) {
+    boolean imagePath = req.getPathInfo() != null && req.getPathInfo().startsWith("/img/");
+    if (!imagePath && (source == null || !source.equals(QoSParams.INTERNAL))) {
 
       // TODO - we don't need to call this *every* request
       double ourLoad = sysStats.getAvarageUsagePerCPU();