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/01/17 19:49:58 UTC
[hadoop] 30/44: HDDS-884. Fix merge issue that causes NPE
OzoneManager#httpServer. Contributed by Xiaoyu Yao.
This is an automated email from the ASF dual-hosted git repository.
xyao pushed a commit to branch HDDS-4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 417951ab587e6905d6ab8c08d4f33063a3f53dae
Author: Xiaoyu Yao <xy...@apache.org>
AuthorDate: Thu Nov 29 13:39:30 2018 -0800
HDDS-884. Fix merge issue that causes NPE OzoneManager#httpServer. Contributed by Xiaoyu Yao.
---
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 918adac..d391516 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -787,6 +787,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
keyManager.start(configuration);
omRpcServer.start();
try {
+ httpServer = new OzoneManagerHttpServer(configuration, this);
httpServer.start();
} catch (Exception ex) {
// Allow OM to start as Http Server failure is not fatal.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org