Merge pull request #423 from elandau/bugfix/getIfSet

config: Fix getIfSet
Netflix · May 21, 2019 · 2a6e2e5 · 2a6e2e5
2 parents 5075840 + f10be52
commit 2a6e2e5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
@@ -309,7 +309,11 @@ private <T> Optional<T> resolverScopedProperty(IClientConfigKey<T> key) {
 
     @Override
     public <T> Optional<T> getIfSet(IClientConfigKey<T> key) {
-        return Optional.ofNullable((T)internalProperties.get(key));
+        Optional<T> value = (Optional<T>)internalProperties.get(key);
+        if (value == null) {
+            return Optional.empty();
+        }
+        return value;
     }
 
     private <T> T resolveValueToType(IClientConfigKey<T> key, Object value) {