giacomo 00/10/30 11:01:11
Modified: src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
Added a patch posted by Uli Niederman to enable the use of the URI
http://localhost:8080/cocoon without a trailing slash.
Revision Changes Path
No revision
No revision
1.1.4.24 +15 -2
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.23
retrieving revision 1.1.4.24
diff -u -r1.1.4.23 -r1.1.4.24
--- CocoonServlet.java 2000/10/06 21:25:31 1.1.4.23
+++ CocoonServlet.java 2000/10/30 19:01:08 1.1.4.24
@@ -40,7 +40,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
- * @version CVS $Revision: 1.1.4.23 $ $Date: 2000/10/06 21:25:31 $
+ * @version CVS $Revision: 1.1.4.24 $ $Date: 2000/10/30 19:01:08 $
*/
public class CocoonServlet extends HttpServlet {
@@ -158,8 +158,21 @@
String pathInfo = req.getPathInfo();
if (pathInfo != null) uri += pathInfo;
+ if (uri.length() == 0) {
+ /* empty relative URI
+ -> HTTP-redirect from /cocoon to /cocoon/ to avoid
+ StringIndexOutOfBoundsException when calling
+ "".charAt(0)
+ else process URI normally
+ */
+ res.sendRedirect(req.getRequestURI()+"/");
+ return;
+ }
+
try {
- if (uri.charAt(0) == '/') uri = uri.substring(1);
+ if (uri.charAt(0) == '/') {
+ uri = uri.substring(1);
+ }
HttpEnvironment env = new HttpEnvironment(uri, req, res,
context);
