From daa1fc2cc42617b362cae17c886d706d48a0b84f Mon Sep 17 00:00:00 2001
From: DTAdmin <sanjay@datatorrent.com>
Date: Sun, 9 Apr 2017 16:19:30 -0700
Subject: [PATCH] YARN-6457  use existing conf object as sslConf object in
 WebApps for the builder to use for the HttpServer2

---
 .../main/java/org/apache/hadoop/yarn/webapp/WebApps.java | 2 +-
 .../org/apache/hadoop/yarn/webapp/util/WebAppUtils.java  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
index bda24aacbbe23..b52354c53145d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
@@ -255,7 +255,7 @@ public void setup() {
         }
 
         if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
-          WebAppUtils.loadSslConfiguration(builder);
+          WebAppUtils.loadSslConfiguration(builder, conf);
         }
 
         HttpServer2 server = builder.build();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java
index 459c1106988f8..91706df91b6a0 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java
@@ -338,11 +338,18 @@ public static HttpServer2.Builder loadSslConfiguration(
    */
   public static HttpServer2.Builder loadSslConfiguration(
       HttpServer2.Builder builder, Configuration sslConf) {
+
+    boolean loadResource = false;
     if (sslConf == null) {
       sslConf = new Configuration(false);
+      loadResource = true;
+    } else {
+      loadResource = (sslConf.get("ssl.server.keystore.location") == null);
     }
     boolean needsClientAuth = YarnConfiguration.YARN_SSL_CLIENT_HTTPS_NEED_AUTH_DEFAULT;
-    sslConf.addResource(YarnConfiguration.YARN_SSL_SERVER_RESOURCE_DEFAULT);
+    if (loadResource) {
+      sslConf.addResource(YarnConfiguration.YARN_SSL_SERVER_RESOURCE_DEFAULT);
+    }
 
     return builder
         .needsClientAuth(needsClientAuth)