URL Encoding issue

At the moment I am hosting Geoserver at an "https://" URL; however, after deployment, all of the WMS/WFS links are "http://" instead of "https://". Here is the offending method in org.vfny.geoserver.util.Requests class:

public static String getBaseUrl(HttpServletRequest httpServletRequest) {
/*

• didier (2004/10/03) assumption removed :
  * return "http://" + httpServletRequest.getServerName() + ":"
  * + httpServletRequest.getServerPort() + "/geoserver/";
  */
  return "http://" + httpServletRequest.getServerName() + ":" + httpServletRequest.getServerPort() + httpServletRequest.getContextPath() +"/";
  }

It should be changed to:

public static String getBaseUrl(HttpServletRequest httpServletRequest) {
return httpServletRequest.getScheme() + "://"
+ httpServletRequest.getServerName() + ":"
+ httpServletRequest.getServerPort() + httpServletRequest.getContextPath() +"/";
}