Author: deepak Date: Thu Mar 19 13:35:51 2015 New Revision: 1667743 URL: http://svn.apache.org/r1667743 Log: Hand merge fix from trunk r#1667733. ========================================= OFBIZ-6183: Fixed String index out of range exception if webapp mounted on "".
Modified: ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Modified: ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1667743&r1=1667742&r2=1667743&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Thu Mar 19 13:35:51 2015 @@ -70,7 +70,11 @@ public class ControlServlet extends Http @Override public void init(ServletConfig config) throws ServletException { super.init(config); - if (Debug.infoOn()) Debug.logInfo("LOADING WEBAPP [" + config.getServletContext().getContextPath().substring(1) + "] " + config.getServletContext().getServletContextName() + ", located at " + config.getServletContext().getRealPath("/"), module); + if (Debug.infoOn()) { + ServletContext servletContext = config.getServletContext(); + String webappName = servletContext.getContextPath().length() != 0 ? servletContext.getContextPath().substring(1) : ""; + Debug.logInfo("LOADING WEBAPP [" + webappName + "] " + config.getServletContext().getServletContextName() + ", located at " + servletContext.getRealPath("/"), module); + } // configure custom BSF engines configureBsf();