cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet CocoonServlet.java

[vgritsenko]

vgritsenko    2003/07/31 06:29:54

  Modified:    src/java/org/apache/cocoon/servlet CocoonServlet.java
  Log:
  Get message from exception
  
  Revision  Changes    Path
  1.11      +8 -7      
cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CocoonServlet.java        31 Jul 2003 03:54:22 -0000      1.10
  +++ CocoonServlet.java        31 Jul 2003 13:29:54 -0000      1.11
  @@ -50,6 +50,7 @@
   */
   package org.apache.cocoon.servlet;
   
  +import java.io.EOFException;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
  @@ -1113,18 +1114,18 @@
                                   rse);
                   return;
   
  -            } catch ( SocketException se ) {
  +            } catch (ConnectionResetException cre) {
                   if (log.isDebugEnabled()) {
  -                    log.debug("The connection was reset", se);
  +                    log.debug(cre.getMessage(), cre);
                   } else if (log.isWarnEnabled()) {
  -                    log.warn(se.getMessage());
  +                    log.warn(cre.getMessage());
                   }
   
  -            } catch (ConnectionResetException cre) {
  +            } catch ( SocketException se ) {
                   if (log.isDebugEnabled()) {
  -                    log.debug(cre.getMessage(), cre);
  +                    log.debug(se.getMessage(), se);
                   } else if (log.isWarnEnabled()) {
  -                    log.warn(cre.getMessage());
  +                    log.warn(se.getMessage());
                   }
   
               } catch (Exception e) {