Avoid repeated calls to getState in AbstractDependentConfig

The getState method was called repeatedly in various AbstractDependentConfig methods, which could incur repeated volatile reads or correctness issues in edge cases.
Netflix · Sep 23, 2024 · 592bcd9 · 592bcd9
1 parent e9bbde9
commit 592bcd9
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/archaius2-core/src/main/java/com/netflix/archaius/config/AbstractDependentConfig.java b/archaius2-core/src/main/java/com/netflix/archaius/config/AbstractDependentConfig.java
@@ -1,8 +1,10 @@
 package com.netflix.archaius.config;
 
+import com.netflix.archaius.api.Config;
 import com.netflix.archaius.api.PropertyDetails;
 
 import java.util.Iterator;
+import java.util.Map;
 import java.util.function.BiConsumer;
 
 /**
@@ -27,9 +29,11 @@ public AbstractDependentConfig() {
 
     @Override
     public Object getRawProperty(String key) {
-        Object value = getState().getData().get(key);
-        if (getState().getInstrumentedKeys().containsKey(key)) {
-            getState().getInstrumentedKeys().get(key).recordUsage(createPropertyDetails(key, value));
+        CachedState state = getState();
+        Object value = state.getData().get(key);
+        Config config = state.getInstrumentedKeys().get(key);
+        if (config != null) {
+            config.recordUsage(createPropertyDetails(key, value));
         }
         return value;
     }
@@ -52,9 +56,11 @@ public Iterable<String> keys() {
 
     @Override
     public void forEachProperty(BiConsumer<String, Object> consumer) {
-        getState().getData().forEach((k, v) -> {
-            if (getState().getInstrumentedKeys().containsKey(k)) {
-                getState().getInstrumentedKeys().get(k).recordUsage(createPropertyDetails(k, v));
+        CachedState state = getState();
+        state.getData().forEach((k, v) -> {
+            Config config = state.getInstrumentedKeys().get(k);
+            if (config != null) {
+                config.recordUsage(createPropertyDetails(k, v));
             }
             consumer.accept(k, v);
         });
@@ -77,8 +83,10 @@ public boolean isEmpty() {
 
     @Override
     public void recordUsage(PropertyDetails propertyDetails) {
-        if (getState().getInstrumentedKeys().containsKey(propertyDetails.getKey())) {
-            getState().getInstrumentedKeys().get(propertyDetails.getKey()).recordUsage(createPropertyDetails(propertyDetails.getKey(), propertyDetails.getValue()));
+        CachedState state = getState();
+        Config config = state.getInstrumentedKeys().get(propertyDetails.getKey());
+        if (config != null) {
+            config.recordUsage(createPropertyDetails(propertyDetails.getKey(), propertyDetails.getValue()));
         }
     }