Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 53667 invoked from network); 13 Dec 2004 14:18:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 13 Dec 2004 14:18:01 -0000 Received: (qmail 35348 invoked by uid 500); 13 Dec 2004 14:16:50 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 35313 invoked by uid 500); 13 Dec 2004 14:16:50 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 35274 invoked by uid 99); 13 Dec 2004 14:16:49 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 13 Dec 2004 06:16:48 -0800 Received: (qmail 53095 invoked by uid 65534); 13 Dec 2004 14:16:41 -0000 Date: 13 Dec 2004 14:16:41 -0000 Message-ID: <20041213141641.53092.qmail@minotaur.apache.org> From: vgritsenko@apache.org To: cvs@cocoon.apache.org Subject: svn commit: r111715 - /cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java /cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: vgritsenko Date: Mon Dec 13 06:16:40 2004 New Revision: 111715 URL: http://svn.apache.org/viewcvs?view=rev&rev=111715 Log: uri must not start with '/' Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java?view=diff&rev=111715&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java&r1=111714&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java&r2=111715 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java Mon Dec 13 06:16:40 2004 @@ -1087,6 +1087,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()) { @@ -1239,6 +1242,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/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java?view=diff&rev=111715&p1=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java&r1=111714&p2=cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java&r2=111715 ============================================================================== --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Mon Dec 13 06:16:40 2004 @@ -372,6 +372,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()) { @@ -515,6 +518,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()) {