You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/03/19 14:38:33 UTC
svn commit: r1667745 -
/ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
Author: deepak
Date: Thu Mar 19 13:38:33 2015
New Revision: 1667745
URL: http://svn.apache.org/r1667745
Log:
Hand merge fix from trunk r#1667733.
=========================================
OFBIZ-6183: Fixed String index out of range exception if webapp mounted on "".
Modified:
ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
Modified: ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1667745&r1=1667744&r2=1667745&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/branches/release12.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Thu Mar 19 13:38:33 2015
@@ -71,7 +71,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 + "] " + servletContext.getServletContextName() + ", located at " + servletContext.getRealPath("/"), module);
+ }
// configure custom BSF engines
configureBsf();