cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteWriter.java

[re...@apache.org]

remm        2002/11/20 05:47:48

  Modified:    coyote/src/java/org/apache/coyote/tomcat5 CoyoteWriter.java
  Log:
  - Full reimplementation of PrintWriter (more optimized for web oriented applications).
  - Fix bug 14658.
  
  Revision  Changes    Path
  1.2       +181 -15   jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteWriter.java
  
  Index: CoyoteWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteWriter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CoyoteWriter.java	4 Aug 2002 19:39:49 -0000	1.1
  +++ CoyoteWriter.java	20 Nov 2002 13:47:48 -0000	1.2
  @@ -68,17 +68,23 @@
   /**
    * Coyote implementation of the servlet writer.
    * 
  - * @author Costin Manolache
    * @author Remy Maucherat
    */
   final class CoyoteWriter
       extends PrintWriter {
   
   
  +    // -------------------------------------------------------------- Constants
  +
  +
  +    private static final char[] LINE_SEP = { '\r', '\n' };
  +
  +
       // ----------------------------------------------------- Instance Variables
   
   
       protected OutputBuffer ob;
  +    protected boolean error = false;
   
   
       // ----------------------------------------------------------- Constructors
  @@ -94,43 +100,203 @@
   
   
       public void flush() {
  -        super.flush();
  -    }
  -
   
  -    public void write(char buf[], int offset, int count) {
  -        super.write(buf, offset, count);
  -    }
  +        if (error)
  +            return;
   
  +        try {
  +            ob.flush();
  +        } catch (IOException e) {
  +            error = true;
  +        }
   
  -    public void write(String str) {
  -        super.write( str );
       }
   
   
       public void close() {
  +
           // We don't close the PrintWriter - super() is not called,
           // so the stream can be reused. We close ob.
           try {
               ob.close();
           } catch (IOException ex ) {
  -            ex.printStackTrace();
  +            ;
           }
  +        error = false;
  +
  +    }
  +
  +
  +    public boolean checkError() {
  +        flush();
  +        return error;
  +    }
  +
  +
  +    public void write(int c) {
  +
  +        if (error)
  +            return;
  +
  +        try {
  +            ob.write(c);
  +        } catch (IOException e) {
  +            error = true;
  +        }
  +
  +    }
  +
  +
  +    public void write(char buf[], int off, int len) {
  +
  +        if (error)
  +            return;
  +
  +        try {
  +            ob.write(buf, off, len);
  +        } catch (IOException e) {
  +            error = true;
  +        }
  +
  +    }
  +
  +
  +    public void write(char buf[]) {
  +	write(buf, 0, buf.length);
  +    }
  +
  +
  +    public void write(String s, int off, int len) {
  +
  +        if (error)
  +            return;
  +
  +        try {
  +            ob.write(s, off, len);
  +        } catch (IOException e) {
  +            error = true;
  +        }
  +
  +    }
  +
  +
  +    public void write(String s) {
  +        write(s, 0, s.length());
       }
   
   
       // ---------------------------------------------------- PrintWriter Methods
   
   
  -    public void print(String str) {
  -        super.print( str );
  +    public void print(boolean b) {
  +        if (b) {
  +            write("true");
  +        } else {
  +            write("false");
  +        }
       }
   
   
  -    public void println(String str) {
  -        super.println(str);
  +    public void print(char c) {
  +        write(c);
       }
   
   
  -}
  +    public void print(int i) {
  +        write(String.valueOf(i));
  +    }
  +
  +
  +    public void print(long l) {
  +        write(String.valueOf(l));
  +    }
  +
  +
  +    public void print(float f) {
  +        write(String.valueOf(f));
  +    }
  +
  +
  +    public void print(double d) {
  +        write(String.valueOf(d));
  +    }
   
  +
  +    public void print(char s[]) {
  +        write(s);
  +    }
  +
  +
  +    public void print(String s) {
  +        if (s == null) {
  +            s = "null";
  +        }
  +        write(s);
  +    }
  +
  +
  +    public void print(Object obj) {
  +        write(String.valueOf(obj));
  +    }
  +
  +
  +    public void println() {
  +        write(LINE_SEP);
  +    }
  +
  +
  +    public void println(boolean b) {
  +        print(b);
  +        println();
  +    }
  +
  +
  +    public void println(char c) {
  +        print(c);
  +        println();
  +    }
  +
  +
  +    public void println(int i) {
  +        print(i);
  +        println();
  +    }
  +
  +
  +    public void println(long l) {
  +        print(l);
  +        println();
  +    }
  +
  +
  +    public void println(float f) {
  +        print(f);
  +        println();
  +    }
  +
  +
  +    public void println(double d) {
  +        print(d);
  +        println();
  +    }
  +
  +
  +    public void println(char c[]) {
  +        print(c);
  +        println();
  +    }
  +
  +
  +    public void println(String s) {
  +        print(s);
  +        println();
  +    }
  +
  +
  +    public void println(Object o) {
  +        print(o);
  +        println();
  +    }
  +
  +
  +}
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>