commit 4abddaccaf9be7095324cfa3c48de13882b2ec2e
author overmeulen <overmeulen@murex.com> Thu Aug 01 16:22:49 2019 +0200
committer Alex Rudyy <orudyy@apache.org> Sat Aug 10 22:33:19 2019 +0100
tree dce0e5f0c66e4a4a9b7d8e729fbd77c76d6bf796
parent 080d96ef7e5e1bbdbeca94b9a64ddec7c6fc79d4

QPID-8289: [Broker-J] Broker startup can fail due to ConcurrentModificationException

This closes #33

broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java

diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index f7b77f1..267356c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -3505,7 +3505,8 @@
         if(!excludeSystem)
         {
             inheritedContext.putAll(System.getenv());
-            inheritedContext.putAll((Map) System.getProperties());
+            //clone is synchronized and will avoid ConcurrentModificationException
+            inheritedContext.putAll((Map) System.getProperties().clone());
         }
         generateInheritedContext(getModel(), this, inheritedContext);
         return Collections.unmodifiableSet(inheritedContext.keySet());