From 2ed6ce3bfbea26e41866c6e46aea711892b8e69c Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Tue, 14 May 2013 22:14:15 +0000 Subject: [PATCH] MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482624 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapred/JobStatus.java | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 6bb3a64bf04..4fb1e8d9bcf 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -254,6 +254,9 @@ Release 2.0.5-beta - UNRELEASED MAPREDUCE-5240. Fix a bug in MRAppMaster because of which OutputCommitter could not access credentials set by the user. (vinodkv) + MAPREDUCE-5244. Two functions changed their visibility in JobStatus. + (zjshen via tucu) + Release 2.0.4-alpha - 2013-04-25 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobStatus.java index e657a1a940d..bf2577d4a95 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobStatus.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobStatus.java @@ -381,8 +381,14 @@ public class JobStatus extends org.apache.hadoop.mapreduce.JobStatus { /** * Change the current run state of the job. + * + * The setter is public to be compatible with M/R 1.x, however, it should be + * used internally. + * + * @param state the state of the job */ - protected synchronized void setRunState(int state) { + @InterfaceAudience.Private + public synchronized void setRunState(int state) { super.setState(getEnum(state)); } @@ -409,10 +415,14 @@ public class JobStatus extends org.apache.hadoop.mapreduce.JobStatus { /** * Used to set the scheduling information associated to a particular Job. - * + * + * The setter is public to be compatible with M/R 1.x, however, it should be + * used internally. + * * @param schedulingInfo Scheduling information of the job */ - protected synchronized void setSchedulingInfo(String schedulingInfo) { + @InterfaceAudience.Private + public synchronized void setSchedulingInfo(String schedulingInfo) { super.setSchedulingInfo(schedulingInfo); }