tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java
Date Fri, 25 Feb 2005 17:32:31 GMT
luehe       2005/02/25 09:32:31

  Modified:    jasper2/src/share/org/apache/jasper/runtime
                        PageContextImpl.java
  Log:
  Fixed indentation prior to making changes
  
  Revision  Changes    Path
  1.63      +20 -20    jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
  
  Index: PageContextImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- PageContextImpl.java	22 Nov 2004 16:35:52 -0000	1.62
  +++ PageContextImpl.java	25 Feb 2005 17:32:31 -0000	1.63
  @@ -802,26 +802,26 @@
               ((HttpServletRequest) request).getRequestURI());
               request.setAttribute("javax.servlet.error.servlet_name",
                        config.getServletName());
  -                try {
  -                    forward(errorPageURL);
  -                } catch (IllegalStateException ise) {
  -                    include(errorPageURL);
  -                }
  -
  -                // The error page could be inside an include.
  -
  -                Object newException = request.getAttribute("javax.servlet.error.exception");
  -
  -                // t==null means the attribute was not set.
  -                if( (newException!= null) && (newException==t) ) {
  -                    request.removeAttribute("javax.servlet.error.exception");
  -                }
  -
  -                // now clear the error code - to prevent double handling.
  -                request.removeAttribute("javax.servlet.error.status_code");
  -                request.removeAttribute("javax.servlet.error.request_uri");
  -                request.removeAttribute("javax.servlet.error.status_code");
  -                request.removeAttribute("javax.servlet.jsp.jspException");
  +            try {
  +                forward(errorPageURL);
  +            } catch (IllegalStateException ise) {
  +                include(errorPageURL);
  +            }
  +
  +            // The error page could be inside an include.
  +
  +            Object newException = request.getAttribute("javax.servlet.error.exception");
  +
  +            // t==null means the attribute was not set.
  +            if( (newException!= null) && (newException==t) ) {
  +                request.removeAttribute("javax.servlet.error.exception");
  +            }
  +
  +            // now clear the error code - to prevent double handling.
  +            request.removeAttribute("javax.servlet.error.status_code");
  +            request.removeAttribute("javax.servlet.error.request_uri");
  +            request.removeAttribute("javax.servlet.error.status_code");
  +            request.removeAttribute("javax.servlet.jsp.jspException");
   
           } else {
               // Otherwise throw the exception wrapped inside a ServletException.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message