HDDS-884. Fix merge issue that causes NPE OzoneManager#httpServer. Contributed by Xiaoyu Yao.

This commit is contained in:
Xiaoyu Yao 2018-11-29 13:39:30 -08:00
parent 6d522dc05d
commit 417951ab58

View File

@ -787,6 +787,7 @@ public void start() throws IOException {
keyManager.start(configuration); keyManager.start(configuration);
omRpcServer.start(); omRpcServer.start();
try { try {
httpServer = new OzoneManagerHttpServer(configuration, this);
httpServer.start(); httpServer.start();
} catch (Exception ex) { } catch (Exception ex) {
// Allow OM to start as Http Server failure is not fatal. // Allow OM to start as Http Server failure is not fatal.