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 04:36:53 UTC
svn commit: r1077063 -
/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java
Author: omalley
Date: Fri Mar 4 03:36:52 2011
New Revision: 1077063
URL: http://svn.apache.org/viewvc?rev=1077063&view=rev
Log:
commit 4c3c8fecf035c1cb49d01b0c44f83dc857030e59
Author: Hemanth Yamijala <yh...@yahoo-inc.com>
Date: Mon Nov 30 16:10:53 2009 +0530
HADOOP:4933 from http://issues.apache.org/jira/secure/attachment/12397116/HADOOP-4933-v1.1.patch
+++ b/YAHOO-CHANGES.txt
+ HADOOP-4933. Fixes a ConcurrentModificationException problem that shows up
+ when the history viewer is accessed concurrently.
+ (Amar Kamat via ddas)
+
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=1077063&r1=1077062&r2=1077063&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 03:36:52 2011
@@ -278,9 +278,6 @@ public class JobHistory {
SUCCESS, FAILED, KILLED, MAP, REDUCE, CLEANUP, RUNNING, PREP, SETUP
}
- // temp buffer for parsed dataa
- private static Map<Keys,String> parseBuffer = new HashMap<Keys, String>();
-
/**
* Initialize JobHistory files.
* @param conf Jobconf of the job tracker.
@@ -482,6 +479,7 @@ public class JobHistory {
String data = line.substring(idx+1, line.length());
Matcher matcher = pattern.matcher(data);
+ Map<Keys,String> parseBuffer = new HashMap<Keys, String>();
while(matcher.find()){
String tuple = matcher.group(0);