Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10456. Merging change r1584575 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584579 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2014-04-04 09:31:51 +00:00
parent 0451f75a4a
commit e97d46029b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -57,6 +57,9 @@ Release 2.4.1 - UNRELEASED
HADOOP-10455. When there is an exception, ipc.Server should first check HADOOP-10455. When there is an exception, ipc.Server should first check
whether it is an terse exception. (szetszwo) whether it is an terse exception. (szetszwo)
HADOOP-10456. Bug in Configuration.java exposed by Spark
(ConcurrentModificationException). (Nishkam Ravi via cnauroth)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -666,9 +666,9 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
} }
this.updatingResource = new HashMap<String, String[]>(other.updatingResource); this.updatingResource = new HashMap<String, String[]>(other.updatingResource);
this.finalParameters = new HashSet<String>(other.finalParameters);
} }
this.finalParameters = new HashSet<String>(other.finalParameters);
synchronized(Configuration.class) { synchronized(Configuration.class) {
REGISTRY.put(this, null); REGISTRY.put(this, null);
} }