Author: jlowe
Date: Thu Sep 26 21:25:49 2013
New Revision: 1526707
URL: http://svn.apache.org/r1526707
Log:
svn merge -c 1526688 FIXES: MAPREDUCE-5513. ConcurrentModificationException in
JobControl. Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1526707&r1=1526706&r2=1526707&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu
Sep 26 21:25:49 2013
@@ -46,6 +46,9 @@ Release 0.23.10 - UNRELEASED
MAPREDUCE-5543. In-memory map outputs can be leaked after shuffle completes
in 0.23 (Jason Lowe via jeagles)
+ MAPREDUCE-5513. ConcurrentModificationException in JobControl (Robert
+ Parker via jlowe)
+
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java?rev=1526707&r1=1526706&r2=1526707&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
Thu Sep 26 21:25:49 2013
@@ -76,13 +76,11 @@ public class JobControl implements Runna
this.runnerState = ThreadState.READY;
}
- private static List<ControlledJob> toList(
+ synchronized private static List<ControlledJob> toList(
LinkedList<ControlledJob> jobs) {
ArrayList<ControlledJob> retv = new ArrayList<ControlledJob>();
- synchronized (jobs) {
- for (ControlledJob job : jobs) {
- retv.add(job);
- }
+ for (ControlledJob job : jobs) {
+ retv.add(job);
}
return retv;
}
