Author: jlowe
Date: Mon Feb 17 16:26:07 2014
New Revision: 1569044
URL: http://svn.apache.org/r1569044
Log:
MAPREDUCE-5757. ConcurrentModificationException in JobControl.toList.
Contributed by Jason Lowe
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=1569044&r1=1569043&r2=1569044&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 Mon
Feb 17 16:26:07 2014
@@ -21,6 +21,9 @@ Release 0.23.11 - UNRELEASED
MAPREDUCE-5746. Job diagnostics can implicate wrong task for a failed job
(jlowe)
+ MAPREDUCE-5757. ConcurrentModificationException in JobControl.toList
+ (jlowe)
+
Release 0.23.10 - 2013-12-09
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=1569044&r1=1569043&r2=1569044&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
Mon Feb 17 16:26:07 2014
@@ -76,7 +76,7 @@ public class JobControl implements Runna
this.runnerState = ThreadState.READY;
}
- synchronized private static List<ControlledJob> toList(
+ private static List<ControlledJob> toList(
LinkedList<ControlledJob> jobs) {
ArrayList<ControlledJob> retv = new ArrayList<ControlledJob>();
for (ControlledJob job : jobs) {
@@ -119,11 +119,11 @@ public class JobControl implements Runna
/**
* @return the jobs in the success state
*/
- public List<ControlledJob> getSuccessfulJobList() {
+ synchronized public List<ControlledJob> getSuccessfulJobList() {
return toList(this.successfulJobs);
}
- public List<ControlledJob> getFailedJobList() {
+ synchronized public List<ControlledJob> getFailedJobList() {
return toList(this.failedJobs);
}
