costin      01/01/25 18:59:55

  Modified:    src/facade22/org/apache/tomcat/facade
                        RequestDispatcherImpl.java
  Log:
  Fix typo in method name - most tests are passing under sandbox.
  
  Revision  Changes    Path
  1.13      +1 -19     
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java
  
  Index: RequestDispatcherImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/RequestDispatcherImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- RequestDispatcherImpl.java        2001/01/25 05:07:35     1.12
  +++ RequestDispatcherImpl.java        2001/01/26 02:59:55     1.13
  @@ -257,22 +257,9 @@
        throws ServletException, IOException
       {
        if( System.getSecurityManager() != null ) {
  -//       final ServletRequest req = request;
  -//       final ServletResponse res = response;
            try {
                includeAction.prepare( request, response );
                jdk11Compat.doPrivileged( includeAction );
  -
  -//           java.security.AccessController.doPrivileged(
  -//               new java.security.PrivilegedExceptionAction()
  -//               {
  -//                   public Object run() throws ServletException, IOException {
  -//                       doInclude(req,res);
  -//                       return null;     
  -//                   }               
  -//               }    
  -//           );   
  -//       } catch( PrivilegedActionException pe) {
            } catch( Exception e) {
                if( e instanceof ServletException )
                    throw (ServletException)e;
  @@ -281,11 +268,6 @@
                // can only be IOException
                throw (IOException)e;
            }
  -//           Exception e = pe.getException();       
  -//           if( e instanceof ServletException )
  -//               throw (ServletException)e;
  -//           throw (IOException)e;
  -//       }
        } else {
            doInclude(request,response);
        }
  @@ -637,7 +619,7 @@
            this.req=req;
            this.res=res;
        }
  -     public Object action() throws Exception {
  +     public Object run() throws Exception {
            if( include )
                rdi.doInclude( req, res );
            else
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to