Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 63256 invoked from network); 17 Jul 2003 11:56:51 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 17 Jul 2003 11:56:51 -0000 Received: (qmail 12687 invoked by uid 97); 17 Jul 2003 11:59:21 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 12680 invoked from network); 17 Jul 2003 11:59:20 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 17 Jul 2003 11:59:20 -0000 Received: (qmail 62330 invoked by uid 500); 17 Jul 2003 11:56:42 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 62316 invoked by uid 500); 17 Jul 2003 11:56:41 -0000 Received: (qmail 62313 invoked from network); 17 Jul 2003 11:56:41 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 17 Jul 2003 11:56:41 -0000 Received: (qmail 42883 invoked by uid 1135); 17 Jul 2003 11:56:41 -0000 Date: 17 Jul 2003 11:56:41 -0000 Message-ID: <20030717115641.42882.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 2003/07/17 04:56:40 Modified: catalina/src/share/org/apache/catalina/core ApplicationDispatcher.java Log: - Fix error page forwarding (bug 21341). Revision Changes Path 1.19 +19 -21 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java Index: ApplicationDispatcher.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ApplicationDispatcher.java 10 Jun 2003 20:02:02 -0000 1.18 +++ ApplicationDispatcher.java 17 Jul 2003 11:56:40 -0000 1.19 @@ -498,28 +498,26 @@ * @exception IOException if an input/output error occurs * @exception ServletException if a servlet error occurs */ - private void processRequest(ServletRequest request, ServletResponse response) - throws IOException, ServletException { + private void processRequest(ServletRequest request, + ServletResponse response) + throws IOException, ServletException { - if (request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR) != null){ - Integer disInt = - (Integer)request.getAttribute( - ApplicationFilterFactory.DISPATCHER_TYPE_ATTR); - + Integer disInt = (Integer) request.getAttribute + (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR); + if (disInt != null) { if (disInt.intValue() != ApplicationFilterFactory.ERROR) { - outerRequest.setAttribute( - ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, - origServletPath); - - outerRequest.setAttribute( - ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, - new Integer(ApplicationFilterFactory.FORWARD)); - + outerRequest.setAttribute + (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, + origServletPath); + outerRequest.setAttribute + (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR, + new Integer(ApplicationFilterFactory.FORWARD)); invoke(outerRequest, response); } else { - invoke(request, response); + invoke(outerRequest, response); } - } + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org