greenrd     01/03/28 10:00:33

  Modified:    src/org/apache/cocoon Frontend.java
               .        changes.xml
  Log:
  fixed error reporting for when getwriter already called
  
  Revision  Changes    Path
  1.10      +15 -4     xml-cocoon/src/org/apache/cocoon/Frontend.java
  
  Index: Frontend.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Frontend.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Frontend.java     2000/11/07 18:30:14     1.9
  +++ Frontend.java     2001/03/28 18:00:30     1.10
  @@ -1,4 +1,4 @@
  -/*-- $Id: Frontend.java,v 1.9 2000/11/07 18:30:14 greenrd Exp $ -- 
  +/*-- $Id: Frontend.java,v 1.10 2001/03/28 18:00:30 greenrd Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -64,7 +64,7 @@
    * smart publishing behavior. (ECS may be used instead).
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
  - * @version $Revision: 1.9 $ $Date: 2000/11/07 18:30:14 $
  + * @version $Revision: 1.10 $ $Date: 2001/03/28 18:00:30 $
    */
   
   public class Frontend implements Defaults {
  @@ -90,8 +90,19 @@
       }
   
       public static void print(ServletResponse response, String title, String 
message) throws IOException {
  -        response.setContentType("text/html");
  -        PrintWriter out = new PrintWriter(response.getWriter());
  +        PrintWriter out;
  +        try {
  +          response.setContentType("text/html");
  +        }
  +        catch (Exception ex) {
  +          ex.printStackTrace ();
  +        }
  +        try {
  +          out = new PrintWriter(response.getWriter());
  +        }
  +        catch (Exception ex) {
  +          out = new PrintWriter(response.getOutputStream ());
  +        }
           header(out, 80);
           out.println("<h3 align=\"center\">" + title + "</h3>");
           if (message != null) out.println("<blockquote><pre>" + message + 
"</pre></blockquote>");
  
  
  
  1.229     +4 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.228
  retrieving revision 1.229
  diff -u -r1.228 -r1.229
  --- changes.xml       2001/03/26 21:31:55     1.228
  +++ changes.xml       2001/03/28 18:00:32     1.229
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes   
  -  $Id: changes.xml,v 1.228 2001/03/26 21:31:55 greenrd Exp $ 
  +  $Id: changes.xml,v 1.229 2001/03/28 18:00:32 greenrd Exp $ 
   -->
   
   <changes title="History of Changes">
  @@ -18,6 +18,9 @@
     </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="RDG" type="fix" due-to="Ulrich Mayring" due-to-email="[EMAIL 
PROTECTED]">
  +   Fixed error reporting on some servlet engines for case where getWriter 
had already been called.
  +  </action>
     <action dev="RDG" type="add" due-to="Peter C. Verhage" 
due-to-email="[EMAIL PROTECTED]">
      Two more xsl:params available in logicsheets - path and relative-filename.
      If the source filename is /home/greenrd/test.xml then path will be 
/home/greenrd and
  
  
  

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