Author: vgritsenko Date: Mon Dec 13 06:14:29 2004 New Revision: 111714 URL: http://svn.apache.org/viewcvs?view=rev&rev=111714 Log: uri must not start with '/'
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java?view=diff&rev=111714&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java&r1=111713&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java&r2=111714 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java Mon Dec 13 06:14:29 2004 @@ -1109,6 +1109,9 @@ Environment env; try { + if (uri.charAt(0) == '/') { + uri = uri.substring(1); + } env = getEnvironment(servletPath, pathInfo, uri, request, res); } catch (Exception e) { if (getLogger().isErrorEnabled()) { @@ -1261,6 +1264,9 @@ Environment env; try { + if (uri.charAt(0) == '/') { + uri = uri.substring(1); + } env = getEnvironment(servletPath, pathInfo, uri, request, res); } catch (Exception e) { if (getLogger().isErrorEnabled()) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java?view=diff&rev=111714&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java&r1=111713&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java&r2=111714 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Mon Dec 13 06:14:29 2004 @@ -412,6 +412,9 @@ Environment env; try { + if (uri.charAt(0) == '/') { + uri = uri.substring(1); + } env = getEnvironment(servletPath, pathInfo, uri, request, res); } catch (Exception e) { if (getLogger().isErrorEnabled()) { @@ -555,6 +558,9 @@ Environment env; try { + if (uri.charAt(0) == '/') { + uri = uri.substring(1); + } env = getEnvironment(servletPath, pathInfo, uri, request, res); } catch (Exception e) { if (getLogger().isErrorEnabled()) {
