HADOOP-15865. ConcurrentModificationException in Configuration.overlay() method. Contributed by Oleksandr Shevchenko.
This commit is contained in:
parent
c2d00c8450
commit
e872ceb810
|
@ -3436,8 +3436,10 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
}
|
||||
|
||||
private void overlay(Properties to, Properties from) {
|
||||
for (Entry<Object, Object> entry: from.entrySet()) {
|
||||
to.put(entry.getKey(), entry.getValue());
|
||||
synchronized (from) {
|
||||
for (Entry<Object, Object> entry : from.entrySet()) {
|
||||
to.put(entry.getKey(), entry.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue