/*
 * Licensed to the University of California, Berkeley under one or more contributor license
 * agreements. See the NOTICE file distributed with this work for additional information regarding
 * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance with the License. You may obtain a
 * copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software distributed under the License
 * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 * or implied. See the License for the specific language governing permissions and limitations under
 * the License.
 */

package tachyon.web;

import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import tachyon.Constants;

import tachyon.conf.TachyonConf;

/**
 * Servlet that provides data for the header navigation bar.
 */
public class WebInterfaceHeaderServlet extends HttpServlet {

  private final transient TachyonConf mTachyonConf;

  public WebInterfaceHeaderServlet(TachyonConf conf) {
    mTachyonConf = conf;
  }
  /**
   * Populate the header with information about master. So we can return to
   * the master from any page.
   *
   * @param request The HttpServletRequest object
   * @param response The HttpServletResponse object
   * @throws ServletException
   * @throws IOException
   */
  @Override
  protected void doGet(HttpServletRequest request, HttpServletResponse response)
      throws ServletException, IOException {
    int masterWebPort = mTachyonConf.getInt(Constants.MASTER_WEB_PORT, 
        Constants.DEFAULT_MASTER_WEB_PORT);
    String masterHostName = mTachyonConf.get(Constants.MASTER_HOSTNAME, "localhost");
    request.setAttribute("masterHost", masterHostName);
    request.setAttribute("masterPort", masterWebPort);
    getServletContext().getRequestDispatcher("/header.jsp").include(request, response);
  }
}

@@ -1035,17 +1035,16 @@
 stants;%0A
-%0A
 import t
@@ -1067,16 +1067,50 @@
 yonConf;
+%0Aimport tachyon.util.NetworkUtils;
 %0A%0A/**%0A *
@@ -1933,16 +1933,24 @@
 stName =
+%0A       
  mTachyo
@@ -1990,19 +1990,51 @@
 ME, 
-%22l
+NetworkUtils.getL
 ocal
-host%22
+HostName(mTachyonConf)
 );%0A 

Fix default Master hostname.