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:59:10 UTC

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

Author: omalley
Date: Fri Mar  4 03:59:10 2011
New Revision: 1077278

URL: http://svn.apache.org/viewvc?rev=1077278&view=rev
Log:
commit 7dd3a8a88ccb2e91b6a15e1abd797506e1689e99
Author: Devaraj Das <dd...@yahoo-inc.com>
Date:   Wed Mar 3 18:55:35 2010 -0800

    MAPREDUCE:1430 from https://issues.apache.org/jira/secure/attachment/12437822/1430-bp20-bugfix.patch
    
    +++ b/YAHOO-CHANGES.txt
    +    MAPREDUCE-1430. Fixes a backport issue with the earlier patch. (ddas)
    +

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

Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1077278&r1=1077277&r2=1077278&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java Fri Mar  4 03:59:10 2011
@@ -206,7 +206,6 @@ public class JobTracker implements MRCon
   
   private Clock clock;
 
-  private Credentials tokenStorage;
   private final JobTokenSecretManager jobTokenSecretManager
     = new JobTokenSecretManager();
 
@@ -1673,7 +1672,7 @@ public class JobTracker implements MRCon
            * BACKPORTED (MAPREDUCE-873)
            */
           job = new JobInProgress(JobTracker.this, conf, null, 
-                                  restartCount, tokenStorage);
+                                  restartCount, new Credentials() /*HACK*/);
 
           // 2. Check if the user has appropriate access
           // Get the user group info for the job's owner
@@ -3647,9 +3646,8 @@ public class JobTracker implements MRCon
     // Create the JobInProgress, do not lock the JobTracker since
     // we are about to copy job.xml from HDFS
     JobInProgress job = null;
-    tokenStorage = ts;
     try {
-      job = new JobInProgress(this, this.conf, jobInfo, 0, tokenStorage);
+      job = new JobInProgress(this, this.conf, jobInfo, 0, ts);
     } catch (Exception e) {
       throw new IOException(e);
     }