cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java

[cr...@apache.org]

craigmcc    01/05/03 16:04:17

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationDispatcher.java
  Log:
  Update handling or a servlet that is included or forwarded to via a
  RequestDispatcher, and uses a <jsp-file> declaration to map the definition
  to a JSP page.
  
  Revision  Changes    Path
  1.14      +19 -7     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
  
  Index: ApplicationDispatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApplicationDispatcher.java	2001/02/06 02:39:43	1.13
  +++ ApplicationDispatcher.java	2001/05/03 23:04:15	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v 1.13 2001/02/06 02:39:43 craigmcc Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/02/06 02:39:43 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v 1.14 2001/05/03 23:04:15 craigmcc Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/05/03 23:04:15 $
    *
    * ====================================================================
    *
  @@ -81,6 +81,7 @@
   import javax.servlet.http.HttpServletResponse;
   import org.apache.catalina.Context;
   import org.apache.catalina.Globals;
  +import org.apache.catalina.HttpRequest;
   import org.apache.catalina.Logger;
   import org.apache.catalina.Wrapper;
   import org.apache.catalina.util.StringManager;
  @@ -97,7 +98,7 @@
    * <code>javax.servlet.ServletResponseWrapper</code>.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.13 $ $Date: 2001/02/06 02:39:43 $
  + * @version $Revision: 1.14 $ $Date: 2001/05/03 23:04:15 $
    */
   
   final class ApplicationDispatcher
  @@ -174,6 +175,15 @@
   		this.pathInfo + ", queryString=" + queryString +
                   ", name=" + this.name);
   
  +        // If this is a wrapper for a JSP page (<jsp-file>), tweak
  +        // the request parameters appropriately
  +        String jspFile = wrapper.getJspFile();
  +        if (jspFile != null) {
  +            if (debug >= 1)
  +                log("-->servletPath=" + jspFile);
  +            this.servletPath = jspFile;
  +        }
  +
       }
   
   
  @@ -189,7 +199,7 @@
       /**
        * The debugging detail level for this component.
        */
  -    private int debug = 0;
  +    private int debug = 1;
   
   
       /**
  @@ -292,8 +302,8 @@
   	// Handle an HTTP named dispatcher forward
   	else if ((servletPath == null) && (pathInfo == null)) {
   
  -	    if (debug >= 1)
  -		log(" Named Dispatcher Forward");
  +            if (debug >= 1)
  +                log(" Named Dispatcher Forward");
               invoke(request, response);
   
   	}
  @@ -411,6 +421,8 @@
   	    ApplicationHttpRequest wrequest =
   		new ApplicationHttpRequest((HttpServletRequest) request);
               wrequest.setAttribute(Globals.NAMED_DISPATCHER_ATTR, name);
  +            if (servletPath != null)
  +                wrequest.setServletPath(servletPath);
               invoke(wrequest, wresponse);
   
   	}