You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by se...@apache.org on 2003/01/27 02:10:41 UTC

cvs commit: jakarta-james/src/java/org/apache/james/util ExtraDotOutputStream.java

serge       2003/01/26 17:10:41

  Modified:    src/java/org/apache/james/util ExtraDotOutputStream.java
  Log:
  Changed dot stuff per bug #14396 so CRCR. and LFLF. will not trigger dot-stuffing.
  
  Revision  Changes    Path
  1.4       +17 -11    jakarta-james/src/java/org/apache/james/util/ExtraDotOutputStream.java
  
  Index: ExtraDotOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/ExtraDotOutputStream.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExtraDotOutputStream.java	14 Jan 2003 13:42:02 -0000	1.3
  +++ ExtraDotOutputStream.java	27 Jan 2003 01:10:40 -0000	1.4
  @@ -42,18 +42,24 @@
        */
       public void write(int b) throws IOException {
           out.write(b);
  -        if (b == '.') {
  -            if (countLast0A0D > 1) {
  -                // add extra dot
  -                out.write('.');
  -            }
  -            countLast0A0D = 0;
  -        } else {
  -            if (b == '\r' || b == '\n') {
  -                countLast0A0D++;
  -            } else {
  +        switch (b) {
  +            case '.':
  +                if (countLast0A0D == 2) {
  +                    // add extra dot
  +                    out.write('.');
  +                }
                   countLast0A0D = 0;
  -            }
  +                break;
  +            case '\r':
  +                countLast0A0D = 1;
  +                break;
  +            case '\n':
  +                if (countLast0A0D == 1) {
  +                    countLast0A0D = 2;
  +                } else {
  +                    countLast0A0D = 0;
  +                }
  +                break;
           }
       }
   
  
  
  

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