struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java
Date Fri, 06 Oct 2000 16:06:10 GMT
craigmcc    00/10/06 09:06:09

  Modified:    src/share/org/apache/struts/action ActionServlet.java
  Log:
  Treat a zero-length pathInfo value the same as a null one when doing
  path mapping.  This works around problems in the web connectors for Tomcat
  (as well as possibly other servers) that return "" instead of null for the
  value of request.getPathInfo().
  
  Submitted by: Christophe Thiebaud <cthiebaud@stylo.it>
  
  Revision  Changes    Path
  1.26      +5 -5      jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
  
  Index: ActionServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ActionServlet.java	2000/10/01 00:47:03	1.25
  +++ ActionServlet.java	2000/10/06 16:06:09	1.26
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
1.25 2000/10/01 00:47:03 craigmcc Exp $
  - * $Revision: 1.25 $
  - * $Date: 2000/10/01 00:47:03 $
  + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
1.26 2000/10/06 16:06:09 craigmcc Exp $
  + * $Revision: 1.26 $
  + * $Date: 2000/10/06 16:06:09 $
    *
    * ====================================================================
    *
  @@ -199,7 +199,7 @@
    * </ul>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.25 $ $Date: 2000/10/01 00:47:03 $
  + * @version $Revision: 1.26 $ $Date: 2000/10/06 16:06:09 $
    */
   
   public class ActionServlet
  @@ -1267,7 +1267,7 @@
   
   	// For prefix matching, we want to match on the path info (if any)
   	path = request.getPathInfo();
  -	if (path != null)
  +	if ((path != null) && (path.length() > 0))
   	    return (path);
   
   	// For extension matching, we want to strip the extension (if any)
  
  
  

Mime
View raw message