HDDS-884. Fix merge issue that causes NPE OzoneManager#httpServer. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5227f752 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5227f752 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5227f752 Branch: refs/heads/HDDS-4 Commit: 5227f75268319ecf5fccab60204d955cded99c00 Parents: da89591 Author: Xiaoyu Yao <x...@apache.org> Authored: Thu Nov 29 13:39:30 2018 -0800 Committer: Xiaoyu Yao <x...@apache.org> Committed: Tue Dec 4 08:03:16 2018 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5227f752/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java ---------------------------------------------------------------------- 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 1e49779..cb99b9e 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 @@ -702,6 +702,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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
