Apache Solr open-source search software
SOLR-15960: Fix EnvUtils.camelCaseToDotsMap thread-safety (#2204)
pjmcarthurd7e53fefe39c
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.javaindex 9bc33e624e9..48f44754c48 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java@@ -29,6 +29,7 @@ import java.util.Objects;import java.util.Properties;import java.util.SortedMap;import java.util.TreeMap;+import java.util.concurrent.ConcurrentHashMap;import java.util.stream.Collectors;import org.apache.solr.common.SolrException;@@ -40,7 +41,7 @@ import org.apache.solr.common.SolrException;public class EnvUtils {private static final SortedMap<String, String> ENV = new TreeMap<>(System.getenv());private static final Map<String, String> CUSTOM_MAPPINGS = new HashMap<>();- private static final Map<String, String> camelCaseToDotsMap = new HashMap<>();+ private static final Map<String, String> camelCaseToDotsMap = new ConcurrentHashMap<>();static {try {@@ -171,14 +172,9 @@ public class EnvUtils {}private static String camelCaseToDotSeparated(String key) {- if (camelCaseToDotsMap.containsKey(key)) {- return camelCaseToDotsMap.get(key);- } else {- String converted =- String.join(".", key.split("(?=[A-Z])")).replace("..", ".").toLowerCase(Locale.ROOT);- camelCaseToDotsMap.put(key, converted);- return converted;- }+ return camelCaseToDotsMap.computeIfAbsent(+ key,+ (k) -> String.join(".", k.split("(?=[A-Z])")).replace("..", ".").toLowerCase(Locale.ROOT));}/** Get property as integer */