You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2014/04/04 11:31:51 UTC
svn commit: r1584579 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/conf/Configuration.java
Author: cnauroth
Date: Fri Apr 4 09:31:51 2014
New Revision: 1584579
URL: http://svn.apache.org/r1584579
Log:
HADOOP-10456. Merging change r1584575 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1584579&r1=1584578&r2=1584579&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Fri Apr 4 09:31:51 2014
@@ -57,6 +57,9 @@ Release 2.4.1 - UNRELEASED
HADOOP-10455. When there is an exception, ipc.Server should first check
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
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1584579&r1=1584578&r2=1584579&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java Fri Apr 4 09:31:51 2014
@@ -666,9 +666,9 @@ public class Configuration implements It
}
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) {
REGISTRY.put(this, null);
}