[lucene-solr] branch branch_8x updated: SolrMetricManager.registerMetric trivial opt

[ds...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch_8x by this push:
     new a3ef427  SolrMetricManager.registerMetric trivial opt
a3ef427 is described below

commit a3ef427310e156e508c7552c6e8b8687d89a111e
Author: David Smiley <ds...@apache.org>
AuthorDate: Mon Apr 20 11:44:44 2020 -0400

    SolrMetricManager.registerMetric trivial opt
    
    Needn't check for existing metric prior to removing.
    (code-reviewed by ab@apache.org)
    
    (cherry picked from commit 37ad0e552dcb56e128686ebbf3070c51537d7599)
---
 solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
index 5385109..9a7d69d 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
@@ -702,8 +702,8 @@ public class SolrMetricManager {
     if (info != null) {
       info.registerMetricName(fullName);
     }
-    synchronized (metricRegistry) {
-      if (force && metricRegistry.getMetrics().containsKey(fullName)) {
+    synchronized (metricRegistry) { // prevent race; register() throws if metric is already present
+      if (force) { // must remove any existing one if present
         metricRegistry.remove(fullName);
       }
       metricRegistry.register(fullName, metric);