HADOOP-15865. ConcurrentModificationException in Configuration.overlay() method. Contributed by Oleksandr Shevchenko.

This commit is contained in:
Wei-Chiu Chuang 2019-08-01 19:56:51 -07:00
parent c2d00c8450
commit e872ceb810

View File

@ -3436,10 +3436,12 @@ private void readTagFromConfig(String attributeValue, String confName, String
} }
private void overlay(Properties to, Properties from) { private void overlay(Properties to, Properties from) {
for (Entry<Object, Object> entry: from.entrySet()) { synchronized (from) {
for (Entry<Object, Object> entry : from.entrySet()) {
to.put(entry.getKey(), entry.getValue()); to.put(entry.getKey(), entry.getValue());
} }
} }
}
private void loadProperty(Properties properties, String name, String attr, private void loadProperty(Properties properties, String name, String attr,
String value, boolean finalParameter, String[] source) { String value, boolean finalParameter, String[] source) {