Fixed StackOverflow error loading configurations (Azure#4853)

test-repo-tih · Aug 8, 2019 · 2f28055 · 2f28055
1 parent 4164b9c
commit 2f28055
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/configuration/Configuration.java
@@ -220,13 +220,19 @@ private <T> T convertOrDefault(String value, T defaultValue) {
      */
     private boolean loadFrom(String name, Function<String, String> loader, String logMessage) {
         String value = loader.apply(name);
-        if (!ImplUtils.isNullOrEmpty(value) && !value.equals(configurations.get(name))) {
+
+        if (value == null) {
+            // Nothing was loaded
+            return false;
+        } else if (value.equals(configurations.get(name))) {
+            // Value loaded is the same, no need to log anything.
+            return true;
+        } else {
+            // Value changed, log it!
             configurations.put(name, value);
             logger.info(logMessage, name, value);
             return true;
         }
-
-        return false;
     }
 
     /*