cvs commit: jakarta-tomcat-4.0/tester/src/tester/org/apache/tester ErrorPage02.java ErrorPage04.java

[craigmcc]

craigmcc    01/03/17 22:12:55

  Modified:    tester/src/tester/org/apache/tester ErrorPage02.java
                        ErrorPage04.java
  Log:
  Make sure that the servlet name gets passed to error pages, along with the
  other specified attributes, per the recent servlet API changes.
  
  Revision  Changes    Path
  1.2       +17 -1     
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage02.java
  
  Index: ErrorPage02.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage02.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ErrorPage02.java  2001/02/21 21:39:51     1.1
  +++ ErrorPage02.java  2001/03/18 06:12:55     1.2
  @@ -67,7 +67,7 @@
    * the ErrorPage01 servlet returns the appropriate status code.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
  + * @version $Revision: 1.2 $ $Date: 2001/03/18 06:12:55 $
    */
   
   public class ErrorPage02 extends HttpServlet {
  @@ -130,6 +130,22 @@
               if (!request_uri.equals(test1) && !request_uri.equals(test2)) {
                   sb.append(" request_uri is ");
                   sb.append(request_uri);
  +                sb.append("/");
  +            }
  +        }
  +
  +        value = request.getAttribute("javax.servlet.error.servlet_name");
  +        if (value == null)
  +            sb.append(" servlet_name is missing/");
  +        else if (!(value instanceof String)) {
  +            sb.append(" servlet_name class is ");
  +            sb.append(value.getClass().getName());
  +            sb.append("/");
  +        } else {
  +            String servlet_name = (String) value;
  +            if (!"ErrorPage01".equals(servlet_name)) {
  +                sb.append(" servlet_name is ");
  +                sb.append(servlet_name);
                   sb.append("/");
               }
           }
  
  
  
  1.2       +17 -1     
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage04.java
  
  Index: ErrorPage04.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/ErrorPage04.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ErrorPage04.java  2001/02/21 21:39:51     1.1
  +++ ErrorPage04.java  2001/03/18 06:12:55     1.2
  @@ -67,7 +67,7 @@
    * the ErrorPage01 servlet returns the appropriate exception.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.1 $ $Date: 2001/02/21 21:39:51 $
  + * @version $Revision: 1.2 $ $Date: 2001/03/18 06:12:55 $
    */
   
   public class ErrorPage04 extends HttpServlet {
  @@ -146,6 +146,22 @@
               if (!request_uri.equals(test1) && !request_uri.equals(test2)) {
                   sb.append(" request_uri is ");
                   sb.append(request_uri);
  +                sb.append("/");
  +            }
  +        }
  +
  +        value = request.getAttribute("javax.servlet.error.servlet_name");
  +        if (value == null)
  +            sb.append(" servlet_name is missing/");
  +        else if (!(value instanceof String)) {
  +            sb.append(" servlet_name class is ");
  +            sb.append(value.getClass().getName());
  +            sb.append("/");
  +        } else {
  +            String servlet_name = (String) value;
  +            if (!"ErrorPage03".equals(servlet_name)) {
  +                sb.append(" servlet_name is ");
  +                sb.append(servlet_name);
                   sb.append("/");
               }
           }