Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-962 Fix CME when parsing system properties 

Add synchronized block against the properties before iterating on them.

JIRA: https://issues.apache.org/jira/browse/ARTEMIS-926
This commit is contained in:
Jeff Mesnil 2017-01-18 15:56:35 +01:00
parent 43aaf52d42
commit 5ae47e8c3c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View File

@ -308,7 +308,7 @@ public class ConfigurationImpl implements Configuration, Serializable {
@Override @Override
public Configuration parseSystemProperties(Properties properties) throws Exception { public Configuration parseSystemProperties(Properties properties) throws Exception {
synchronized (properties) {
Map<String, Object> beanProperties = new HashMap<>(); Map<String, Object> beanProperties = new HashMap<>();
for (Map.Entry<Object, Object> entry : properties.entrySet()) { for (Map.Entry<Object, Object> entry : properties.entrySet()) {
@ -325,6 +325,7 @@ public class ConfigurationImpl implements Configuration, Serializable {
return this; return this;
} }
}
@Override @Override
public boolean isClustered() { public boolean isClustered() {