[solr] branch branch_9x updated: SOLR-15903 Fix incompatible types used with java collections (#505)

[janhoy]

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new e867210  SOLR-15903 Fix incompatible types used with java collections 
(#505)
e867210 is described below

commit e8672108bede52e406da536411392ad6381f7bd9
Author: Mike Drob <md...@apache.org>
AuthorDate: Tue Jan 11 07:36:33 2022 -0600

    SOLR-15903 Fix incompatible types used with java collections (#505)
    
    (cherry picked from commit 0e95c3fff1584a09927aacb6ed67d638b7077c78)
---
 gradle/validation/error-prone.gradle                                | 1 -
 solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java    | 2 +-
 solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle/validation/error-prone.gradle 
b/gradle/validation/error-prone.gradle
index 99ba520..706de1c 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -85,7 +85,6 @@ allprojects { prj ->
             '-Xep:BadInstanceof:OFF',
             '-Xep:BadShiftAmount:OFF',
             '-Xep:ClassCanBeStatic:OFF',
-            '-Xep:CollectionIncompatibleType:OFF',
             '-Xep:CollectionUndefinedEquality:OFF',
             '-Xep:ComplexBooleanConstant:OFF',
             '-Xep:DoubleBraceInitialization:OFF',
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 aa9b87e..b486475 100644
--- a/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
+++ b/solr/core/src/java/org/apache/solr/servlet/RateLimitManager.java
@@ -62,7 +62,7 @@ public class RateLimitManager implements 
ClusterPropertiesListener {
   public boolean onChange(Map<String, Object> properties) {
 
     // Hack: We only support query rate limiting for now
-    QueryRateLimiter queryRateLimiter = (QueryRateLimiter) 
requestRateLimiterMap.get(SolrRequest.SolrRequestType.QUERY);
+    QueryRateLimiter queryRateLimiter = (QueryRateLimiter) 
getRequestRateLimiter(SolrRequest.SolrRequestType.QUERY);
 
     if (queryRateLimiter != null) {
       try {
diff --git 
a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java 
b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
index 9dbeb61..04fab5d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
@@ -60,7 +60,7 @@ public class SolrZooKeeper extends ZooKeeper {
         try {
           AccessController.doPrivileged((PrivilegedAction<Void>) 
this::closeZookeeperChannel);
         } finally {
-          spawnedThreads.remove(this);
+          spawnedThreads.remove(Thread.currentThread());
         }
       }