tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Date Thu, 18 Aug 2005 13:25:18 GMT
remm        2005/08/18 06:25:18

  Modified:    catalina/src/share/org/apache/catalina/connector
                        ClientAbortException.java
               catalina/src/share/org/apache/catalina/core
                        StandardHostValve.java
               webapps/docs changelog.xml
  Log:
  - 35984: Use getCause.
  
  Revision  Changes    Path
  1.3       +6 -6      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java
  
  Index: ClientAbortException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/ClientAbortException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClientAbortException.java	27 Feb 2004 14:58:41 -0000	1.2
  +++ ClientAbortException.java	18 Aug 2005 13:25:18 -0000	1.3
  @@ -112,15 +112,15 @@
   
   
       /**
  -     * Returns the throwable that caused this exception, if any.
  +     * Returns the cause that caused this exception, if any.
        */
  -    public Throwable getThrowable() {
  -
  +    public Throwable getCause() {
  +        
           return (throwable);
  -
  +        
       }
   
  -
  +    
       /**
        * Return a formatted string that describes this exception.
        */
  
  
  
  1.25      +7 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- StandardHostValve.java	27 Sep 2004 16:04:05 -0000	1.24
  +++ StandardHostValve.java	18 Aug 2005 13:25:18 -0000	1.25
  @@ -174,10 +174,12 @@
   
           // If this is an aborted request from a client just log it and return
           if (realError instanceof ClientAbortException ) {
  -            log.debug
  -                (sm.getString("standardHost.clientAbort",
  -                              ((ClientAbortException) realError).getThrowable()
  -                              .getMessage()));
  +            if (log.isDebugEnabled()) {
  +                log.debug
  +                    (sm.getString("standardHost.clientAbort",
  +                        ((ClientAbortException) realError).getCause()
  +                        .getMessage()));
  +            }
               return;
           }
   
  
  
  
  1.359     +6 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.358
  retrieving revision 1.359
  diff -u -r1.358 -r1.359
  --- changelog.xml	17 Aug 2005 15:07:19 -0000	1.358
  +++ changelog.xml	18 Aug 2005 13:25:18 -0000	1.359
  @@ -86,6 +86,12 @@
           <bug>35978</bug>: Bad handling of single range requests greater than
2GB in the DefaultServlet
           (remm)
         </fix>
  +      <fix>
  +        <bug>35984</bug>: Client abort exceptions will now use getCause (remm)
  +      </fix>
  +      <fix>
  +        Fix handling of non-file based includes with SSI, submitted by David Becker (markt)
  +      </fix>
       </changelog>
     </subsection>
     
  
  
  

---------------------------------------------------------------------
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