cvs commit: xml-cocoon/src/org/apache/cocoon/servlet CocoonServlet.java

[bloritsch]

bloritsch    00/11/15 07:51:48

  Modified:    src/org/apache/cocoon/servlet Tag: xml-cocoon2
                        CocoonServlet.java
  Log:
  Fix for Servlet Engines who return null for req.getServletPath() when the 
servlet
  path is at the root.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.29  +7 -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.28
  retrieving revision 1.1.4.29
  diff -u -r1.1.4.28 -r1.1.4.29
  --- CocoonServlet.java        2000/11/15 15:24:07     1.1.4.28
  +++ CocoonServlet.java        2000/11/15 15:51:47     1.1.4.29
  @@ -47,7 +47,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.28 $ $Date: 2000/11/15 15:24:07 $
  + * @version CVS $Revision: 1.1.4.29 $ $Date: 2000/11/15 15:51:47 $
    */
   
   public class CocoonServlet extends HttpServlet {
  @@ -178,6 +178,7 @@
   
           // We got it... Process the request
           String uri =  req.getServletPath();
  +        if (uri == null) uri = "";
           String pathInfo = req.getPathInfo();
           if (pathInfo != null) uri += pathInfo;
   
  @@ -188,7 +189,11 @@
                       "".charAt(0)
                  else process URI normally
               */
  -            res.sendRedirect(req.getRequestURI()+"/");
  +            String prefix = req.getRequestURI();
  +
  +            if (prefix == null) prefix = "";
  +
  +            res.sendRedirect(prefix + "/");
               return;
           }