Repository: maven Updated Branches: refs/heads/master a18f5af19 -> 4da87163f
Added synchronization around copying system properties since they are a singleton, fix for [MRRESOURCES-65] and similar problem in assembly Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4da87163 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4da87163 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4da87163 Branch: refs/heads/master Commit: 4da87163f9da3cdd44e5a9ac5cc050225e2692aa Parents: a18f5af Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Fri Jun 20 17:14:38 2014 +0200 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Fri Jun 20 17:16:52 2014 +0200 ---------------------------------------------------------------------- .../org/apache/maven/project/DefaultProjectBuildingRequest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/4da87163/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java index cb99106..f3cafdb 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java @@ -165,7 +165,10 @@ public class DefaultProjectBuildingRequest if ( systemProperties != null ) { this.systemProperties = new Properties(); - this.systemProperties.putAll( systemProperties ); + synchronized ( systemProperties ) + { // avoid concurrentmodification if someone else sets/removes an unrelated system property + this.systemProperties.putAll( systemProperties ); + } } else {
