You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/08/11 14:19:27 UTC
[qpid-broker-j] branch 7.0.x updated: QPID-8289: [Broker-J] Broker
startup can fail due to ConcurrentModificationException
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 01a264f QPID-8289: [Broker-J] Broker startup can fail due to ConcurrentModificationException
01a264f is described below
commit 01a264fe2c98f24a67634dc53c7347643811be03
Author: overmeulen <ov...@murex.com>
AuthorDate: Thu Aug 1 16:22:49 2019 +0200
QPID-8289: [Broker-J] Broker startup can fail due to ConcurrentModificationException
This closes #33
(cherry picked from commit 4abddaccaf9be7095324cfa3c48de13882b2ec2e)
---
.../java/org/apache/qpid/server/model/AbstractConfiguredObject.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 3b01324..c6a0c74 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
@@ -3246,7 +3246,8 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
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());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org