svn commit: r1557119 - in /ofbiz/branches/release13.07: ./ framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

[adrianc]

Author: adrianc
Date: Fri Jan 10 13:33:08 2014
New Revision: 1557119

URL: http://svn.apache.org/r1557119
Log:
Merged revision(s) 1557118 from ofbiz/branches/release12.04:
Fixed an IndexOutOfBoundsException in RequestHandler.java. Patch supplied by Ritu Raj Lakhera - https://issues.apache.org/jira/browse/OFBIZ-5471.

Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/branches/release12.04:r1557118

Modified: ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1557119&r1=1557118&r2=1557119&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/release13.07/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Fri Jan 10 13:33:08 2014
@@ -806,7 +806,10 @@ public class RequestHandler {
         // if the view name starts with the control servlet name and a /, then it was an
         // attempt to override the default view with a call back into the control servlet,
         // so just get the target view name and use that
-        String servletName = req.getServletPath().substring(1);
+        String servletName = req.getServletPath();
+        if (servletName.startsWith("/")) {
+            servletName = servletName.substring(1);
+        }
 
         if (Debug.infoOn()) Debug.logInfo("Rendering View [" + view + "], sessionId=" + UtilHttp.getSessionId(req), module);
         if (view.startsWith(servletName + "/")) {