github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-01-30 14:10:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ConcurrentModificationException that occurs when system properties are being modified during a call to ConfigImpl#loadSystemProperties

Browse Source
This commit is contained in:
Michael Pilquist 2013-03-18 16:51:52 -04:00
parent b5b0f17ac1
commit 89956ea7df
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/src/main/java/com/typesafe/config/impl/ConfigImpl.java
View File

@ -10,6 +10,7 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import com.typesafe.config.Config; import com.typesafe.config.Config;
@ -289,8 +290,18 @@ public class ConfigImpl {
} }
} }
private static Properties getSystemProperties() {
// Avoid ConcurrentModificationException due to parallel setting of system properties by copying properties
final Properties systemProperties = System.getProperties();
final Properties systemPropertiesCopy = new Properties();
synchronized (systemProperties) {
systemPropertiesCopy.putAll(systemProperties);
}
return systemPropertiesCopy;
}
private static AbstractConfigObject loadSystemProperties() { private static AbstractConfigObject loadSystemProperties() {
return (AbstractConfigObject) Parseable.newProperties(System.getProperties(), return (AbstractConfigObject) Parseable.newProperties(getSystemProperties(),
ConfigParseOptions.defaults().setOriginDescription("system properties")).parse(); ConfigParseOptions.defaults().setOriginDescription("system properties")).parse();
} }