[solr] branch main updated: QueryRateLimiter should not error on empty input (#516)

[mdrob]

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

mdrob pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 548fd64  QueryRateLimiter should not error on empty input (#516)
548fd64 is described below

commit 548fd649ae9232dd8a787d6c484254fb030bcd6a
Author: Mike Drob <md...@apache.org>
AuthorDate: Thu Jan 13 11:22:57 2022 -0600

    QueryRateLimiter should not error on empty input (#516)
---
 solr/core/src/java/org/apache/solr/servlet/QueryRateLimiter.java | 2 +-
 solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/QueryRateLimiter.java 
b/solr/core/src/java/org/apache/solr/servlet/QueryRateLimiter.java
index 36e5d3b..d3bb8ed 100644
--- a/solr/core/src/java/org/apache/solr/servlet/QueryRateLimiter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/QueryRateLimiter.java
@@ -47,7 +47,7 @@ public class QueryRateLimiter extends RequestRateLimiter {
     RateLimiterConfig rateLimiterConfig = getRateLimiterConfig();
     byte[] configInput = Utils.toJSON(properties.get(RL_CONFIG_KEY));
 
-    if (configInput == null) {
+    if (configInput == null || configInput.length == 0) {
       return;
     }
 
diff --git a/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java 
b/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
index b486475..d89d07e 100644
--- a/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
+++ b/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
@@ -19,6 +19,7 @@ package org.apache.solr.servlet;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.Map;
@@ -68,7 +69,7 @@ public class RateLimitManager implements 
ClusterPropertiesListener {
       try {
         queryRateLimiter.processConfigChange(properties);
       } catch (IOException e) {
-        throw new RuntimeException("Encountered IOException: " + 
e.getMessage());
+        throw new UncheckedIOException(e);
       }
     }