vgritsenko    2003/02/11 19:15:54

  Modified:    .        changes.xml
               src/java/org/apache/cocoon/servlet CocoonServlet.java
  Log:
  Reflect changes to exception handling
  
  Revision  Changes    Path
  1.345     +10 -2     xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.344
  retrieving revision 1.345
  diff -u -r1.344 -r1.345
  --- changes.xml       2 Feb 2003 03:26:46 -0000       1.344
  +++ changes.xml       12 Feb 2003 03:15:54 -0000      1.345
  @@ -40,6 +40,14 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="fix" fixes-bug="16267">
  +    Improve default exception handling behavior in CocoonServlet: show exception 
stacktrace
  +    only when log level is INFO or DEBUG, and add exception message to "Not Found" 
page.
  +  </action> 
  +  <action dev="VG" type="fix" fixes-bug="16264">
  +    Use Environment.tryResetResponse() instead of HttpServletResponse.reset() in 
CocoonServlet
  +    to avoid IllegalStateException if response was already committed.
  +  </action> 
     <action dev="VG" type="update" fixes-bug="11861" due-to="Michael Homeijer" 
due-to-email="[EMAIL PROTECTED]">
       Add support for Collection objects to the CastorTransformer.
       Upgrade to the SAX2 API, improve logging, and use SourceResolver to load 
mappings.
  @@ -56,7 +64,7 @@
       "ascii", "clob", "blob", and "binary" columns. Added getSize() method to 
FilePart.
     </action>
     <action dev="CH" type="add" fixes-bug="9075"
  -                   due-to="Michael Gerzabek" 
due-to-email="[EMAIL PROTECTED]">
  +          due-to="Michael Gerzabek" due-to-email="[EMAIL PROTECTED]">
       SAP R/3 connectivity components added.
     </action> 
     <action dev="CH" type="update">
  
  
  
  1.48      +6 -6      
xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- CocoonServlet.java        2 Feb 2003 23:35:36 -0000       1.47
  +++ CocoonServlet.java        12 Feb 2003 03:15:54 -0000      1.48
  @@ -1139,12 +1139,12 @@
               }
           } finally {
               if (ctxMap != null) ctxMap.clear();
  -            try{
  -                 ServletOutputStream out = res.getOutputStream();
  -                 out.flush();
  -                 out.close();
  +            try {
  +                ServletOutputStream out = res.getOutputStream();
  +                out.flush();
  +                out.close();
               } catch(Exception e) {
  -                  log.error("Cocoon servlet got an Exception while trying to close 
stream.", e);
  +                log.error("Cocoon servlet got an Exception while trying to close 
stream.", e);
               }
           }
       }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to