Merge pull request lightbend#464 from camullen/master

ConfigFactory.invalidateCaches() also resets environment variables cache

Author: havocp

config/src/main/java/com/typesafe/config/ConfigFactory.java

@@ -496,6 +496,7 @@ public static void invalidateCaches() {
         // We rely on this having the side effect that it drops
         // all caches
         ConfigImpl.reloadSystemPropertiesConfig();
+        ConfigImpl.reloadEnvVariablesConfig();
     }
 
     /**

config/src/main/java/com/typesafe/config/impl/ConfigImpl.java

@@ -339,7 +339,7 @@ private static AbstractConfigObject loadEnvVariables() {
     }
 
     private static class EnvVariablesHolder {
-        static final AbstractConfigObject envVariables = loadEnvVariables();
+        static volatile AbstractConfigObject envVariables = loadEnvVariables();
     }
 
     static AbstractConfigObject envVariablesAsConfigObject() {
@@ -354,6 +354,12 @@ public static Config envVariablesAsConfig() {
         return envVariablesAsConfigObject().toConfig();
     }
 
+    public static void reloadEnvVariablesConfig() {
+        // ConfigFactory.invalidateCaches() relies on this having the side
+        // effect that it drops all caches
+        EnvVariablesHolder.envVariables = loadEnvVariables();
+    }
+
     public static Config defaultReference(final ClassLoader loader) {
         return computeCachedConfig(loader, "defaultReference", new Callable<Config>() {
             @Override