You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/08/12 01:57:47 UTC
[lucene-solr] 02/02: @517 Avoid NPE in qos filter.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 2c0a4ac27c6cf7dab7ecb0a8a9de74d9b8f8011a
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();