cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@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
Date Mon, 13 Dec 2004 14:16:41 GMT
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()) {

Mime
View raw message