Merge pull request docker-java#774 from rafaroca/reduce-sys-prop-racecondition

KostyaSha · web-flow · commit 1d9edee262d0 · 2017-01-10T13:41:29.000+03:00
Clone system properties on access in default config
diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -188,7 +188,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
     }
 
     public static Builder createDefaultConfigBuilder() {
-        return createDefaultConfigBuilder(System.getenv(), System.getProperties());
+        return createDefaultConfigBuilder(System.getenv(), (Properties) System.getProperties().clone());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`public static Builder createDefaultConfigBuilder() {`
`191`		`- return createDefaultConfigBuilder(System.getenv(), System.getProperties());`
	`191`	`+ return createDefaultConfigBuilder(System.getenv(), (Properties) System.getProperties().clone());`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/**`