Author: deepak Date: Thu Mar 19 12:55:28 2015 New Revision: 1667733 URL: http://svn.apache.org/r1667733 Log: OFBIZ-6183: Fixed String index out of range exception if webapp mounted on "".
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java?rev=1667733&r1=1667732&r2=1667733&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java Thu Mar 19 12:55:28 2015 @@ -156,7 +156,7 @@ public class SeoCatalogUrlServlet extend public static String makeCatalogUrl(HttpServletRequest request, String productId, String currentCategoryId, String previousCategoryId) { StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append(request.getSession().getServletContext().getContextPath()); - if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + if (urlBuilder.length() == 0 || urlBuilder.charAt(urlBuilder.length() - 1) != '/') { urlBuilder.append("/"); } urlBuilder.append(CATALOG_URL_MOUNT_POINT); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java?rev=1667733&r1=1667732&r2=1667733&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java Thu Mar 19 12:55:28 2015 @@ -148,7 +148,7 @@ public class SeoContentUrlFilter extends } StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append(request.getSession().getServletContext().getContextPath()); - if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + if (urlBuilder.length() == 0 || urlBuilder.charAt(urlBuilder.length() - 1) != '/') { urlBuilder.append("/"); } if (UtilValidate.isNotEmpty(SeoControlServlet.controlServlet)) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java?rev=1667733&r1=1667732&r2=1667733&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java Thu Mar 19 12:55:28 2015 @@ -251,7 +251,7 @@ public class CatalogUrlSeoTransform impl StringBuilder urlBuilder = new StringBuilder(); GenericValue product = null; urlBuilder.append((request.getSession().getServletContext()).getContextPath()); - if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + if (urlBuilder.length() == 0 || urlBuilder.charAt(urlBuilder.length() - 1) != '/') { urlBuilder.append("/"); } if (UtilValidate.isNotEmpty(productId)) { @@ -337,7 +337,7 @@ public class CatalogUrlSeoTransform impl StringBuilder urlBuilder = new StringBuilder(); urlBuilder.append((request.getSession().getServletContext()).getContextPath()); - if (urlBuilder.charAt(urlBuilder.length() - 1) != '/') { + if (urlBuilder.length() == 0 || urlBuilder.charAt(urlBuilder.length() - 1) != '/') { urlBuilder.append("/"); } urlBuilder.append(CatalogUrlServlet.CATEGORY_REQUEST + "/"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1667733&r1=1667732&r2=1667733&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Thu Mar 19 12:55:28 2015 @@ -72,7 +72,8 @@ public class ControlServlet extends Http super.init(config); if (Debug.infoOn()) { ServletContext servletContext = config.getServletContext(); - Debug.logInfo("Loading webapp [" + servletContext.getContextPath().substring(1) + "], located at " + servletContext.getRealPath("/"), module); + String webappName = servletContext.getContextPath().length() != 0 ? servletContext.getContextPath().substring(1) : ""; + Debug.logInfo("Loading webapp [" + webappName + "], located at " + servletContext.getRealPath("/"), module); } // configure custom BSF engines