MAPREDUCE-4567. Fix failing TestJobKillAndFail in branch-1.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1375689 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -181,6 +181,8 @@ Release 1.2.0 - unreleased
     HADOOP-8611. Allow fall-back to the shell-based implementation when
     JNI-based users-group mapping fails (Robert Parker via bobby)
 
+    MAPREDUCE-4567. Fix failing TestJobKillAndFail in branch-1. (tomwhite)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

src/mapred/org/apache/hadoop/mapred/JobInProgress.java

@@ -833,7 +833,7 @@ public class JobInProgress {
       return;
     }
     if (this.status.getRunState() == JobStatus.PREP) {
-      this.status.setRunState(JobStatus.RUNNING);
+      changeStateTo(JobStatus.RUNNING);
       JobHistory.JobInfo.logStarted(profile.getJobID());
     }
   }