Browse Source

YARN-4562. YARN WebApp ignores the configuration passed to it for keystore settings. Contributed by Sergey Shelukhin.

(cherry picked from commit 07920acc165f17e8fe3ca9d21283a2123223f438)
(cherry picked from commit 4baee3eb674cfdab6e1bfa678211354656829ae3)
Varun Vasudev 9 years ago
parent
commit
341457a0f2

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java

@@ -255,7 +255,7 @@ public class WebApps {
         }
         }
 
 
         if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
         if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
-          WebAppUtils.loadSslConfiguration(builder);
+          WebAppUtils.loadSslConfiguration(builder, conf);
         }
         }
 
 
         HttpServer2 server = builder.build();
         HttpServer2 server = builder.build();