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 om...@apache.org on 2011/03/04 05:50:14 UTC

svn commit: r1077739 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java

Author: omalley
Date: Fri Mar  4 04:50:13 2011
New Revision: 1077739

URL: http://svn.apache.org/viewvc?rev=1077739&view=rev
Log:
commit 98d8043ef96dd9a67e23852b5e5caf8f0a4589db
Author: Krishna Ramachandran <ra...@yahoo-inc.com>
Date:   Thu Oct 21 12:21:50 2010 -0700

    . Delete PrintWriter using iterator to fix
        java.util.ConcurrentModificationException (dking)

Modified:
    hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java?rev=1077739&r1=1077738&r2=1077739&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java Fri Mar  4 04:50:13 2011
@@ -823,11 +823,12 @@ public class JobHistory {
     }
     builder.append(LINE_DELIMITER_CHAR);
     
-    for (PrintWriter out : writers) {
+    for (Iterator<PrintWriter> iter = writers.iterator(); iter.hasNext();) {
+      PrintWriter out = iter.next();
       out.println(builder.toString());
       if (out.checkError() && id != null) {
         LOG.info("Logging failed for job " + id + "removing PrintWriter from FileManager");
-        fileManager.removeWriter(id, out);
+        iter.remove();
       }
     }
   }