From 76e4f13ad125e182873f136585b1befa36675df6 Mon Sep 17 00:00:00 2001
From: Yuriy Malygin <yuriy@malyg.in>
Date: Wed, 21 Mar 2018 16:25:27 +0300
Subject: [PATCH] Revert "Fix possible NPE when start Application Master"

---
 .../yarn/server/webproxy/amfilter/AmFilterInitializer.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java
index 100cc27e043e1..27742e41a29e2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java
@@ -68,9 +68,7 @@ public void initFilter(FilterContainer container, Configuration conf) {
       List<String> urls = new ArrayList<>();
       for (String rmId : rmIds) {
         String url = getUrlByRmId(yarnConf, rmId);
-        if (url != null) {
-          urls.add(url);
-        }
+        urls.add(url);
       }
       if (!urls.isEmpty()) {
         params.put(RM_HA_URLS, StringUtils.join(",", urls));