From bda748ac3abf30f6cd4c0e22c80c73396abc59fb Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Fri, 12 Dec 2014 12:34:43 +0530 Subject: [PATCH] YARN-2243. Order of arguments for Preconditions.checkNotNull() is wrong in SchedulerApplicationAttempt ctor. Contributed by Devaraj K. --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/scheduler/SchedulerApplicationAttempt.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3432f6f8bb..58d28b8ad6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -217,6 +217,9 @@ Release 2.7.0 - UNRELEASED YARN-2917. Fixed potential deadlock when system.exit is called in AsyncDispatcher (Rohith Sharmaks via jianhe) + YARN-2243. Order of arguments for Preconditions.checkNotNull() is wrong in + SchedulerApplicationAttempt ctor. (devaraj) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java index 84975b6b84..d5b6ce6698 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerApplicationAttempt.java @@ -125,7 +125,7 @@ public class SchedulerApplicationAttempt { public SchedulerApplicationAttempt(ApplicationAttemptId applicationAttemptId, String user, Queue queue, ActiveUsersManager activeUsersManager, RMContext rmContext) { - Preconditions.checkNotNull("RMContext should not be null", rmContext); + Preconditions.checkNotNull(rmContext, "RMContext should not be null"); this.rmContext = rmContext; this.appSchedulingInfo = new AppSchedulingInfo(applicationAttemptId, user, queue,