You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2019/03/09 17:48:42 UTC
[hadoop] 02/02: HDDS-1235. BaseHttpServer NPE is HTTP policy is
HTTPS_ONLY. Contributed by Xiaoyu Yao.
This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch ozone-0.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 49217971b501bfab6231a8f8d3817514bb005f9d
Author: Xiaoyu Yao <xy...@apache.org>
AuthorDate: Sat Mar 9 09:38:01 2019 -0800
HDDS-1235. BaseHttpServer NPE is HTTP policy is HTTPS_ONLY. Contributed by Xiaoyu Yao.
Closes #572
(cherry picked from commit 11db46956c6062a986caf9009d3e36049e5830d4)
---
.../java/org/apache/hadoop/hdds/server/BaseHttpServer.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/BaseHttpServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/BaseHttpServer.java
index 4cc9b52..9a1d4b3 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/BaseHttpServer.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/BaseHttpServer.java
@@ -65,14 +65,10 @@ public abstract class BaseHttpServer {
public BaseHttpServer(Configuration conf, String name) throws IOException {
this.name = name;
this.conf = conf;
+ policy = DFSUtil.getHttpPolicy(conf);
if (isEnabled()) {
- policy = DFSUtil.getHttpPolicy(conf);
- if (policy.isHttpEnabled()) {
- this.httpAddress = getHttpBindAddress();
- }
- if (policy.isHttpsEnabled()) {
- this.httpsAddress = getHttpsBindAddress();
- }
+ this.httpAddress = getHttpBindAddress();
+ this.httpsAddress = getHttpsBindAddress();
HttpServer2.Builder builder = null;
builder = DFSUtil.httpServerTemplateForNNAndJN(conf, this.httpAddress,
this.httpsAddress, name, getSpnegoPrincipal(), getKeytabFile());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org