diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2c37207f161..12c0d734aa7 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -44,6 +44,9 @@ Release 2.9.0 - UNRELEASED
     YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit
     (tangshangwen via rohithsharmaks)
 
+    YARN-4535. Fix checkstyle error in CapacityScheduler.java
+    (Naganarasimha G R via rohithsharmaks)
+
 Release 2.8.0 - UNRELEASED
 
   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/capacity/CapacityScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index 159c7a59d55..c7b73fb6c93 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -647,10 +647,10 @@ public class CapacityScheduler extends
       parentQueue.setChildQueues(childQueues);
     }
 
-    if(queue instanceof LeafQueue == true && queues.containsKey(queueName)
-      && queues.get(queueName) instanceof LeafQueue == true) {
+    if (queue instanceof LeafQueue && queues.containsKey(queueName)
+        && queues.get(queueName) instanceof LeafQueue) {
       throw new IOException("Two leaf queues were named " + queueName
-        + ". Leaf queue names must be distinct");
+          + ". Leaf queue names must be distinct");
     }
     queues.put(queueName, queue);