diff options
| author | Chris Burdess <dog@bluezoo.org> | 2006-02-25 10:53:05 +0000 |
|---|---|---|
| committer | Chris Burdess <dog@bluezoo.org> | 2006-02-25 10:53:05 +0000 |
| commit | ec4b60b20cc9d60c2260bb776e9118b041a3ee70 (patch) | |
| tree | daacd486963c04d0f319cf1de849268f51dd766b /gnu/java/net/CRLFInputStream.java | |
| parent | 3ef6532f9b2e875cfec2f09a141a2f1cbba1651c (diff) | |
| download | classpath-generics-merge-20060225.tar.gz | |
2006-02-25 Chris Burdess <dog@gnu.org>generics-merge-20060225
* gnu/java/net/CRLFInputStream.java,
gnu/java/net/LineInputStream.java: Streams that use mark
capabilities on the underlying stream do not expose mark
functionality themselves.
* gnu/xml/stream/CRLFReader.java: Fix incorrect end condition when
off > 0.
Diffstat (limited to 'gnu/java/net/CRLFInputStream.java')
| -rw-r--r-- | gnu/java/net/CRLFInputStream.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/java/net/CRLFInputStream.java b/gnu/java/net/CRLFInputStream.java index e021daf1b..ac3482679 100644 --- a/gnu/java/net/CRLFInputStream.java +++ b/gnu/java/net/CRLFInputStream.java @@ -1,5 +1,5 @@ /* CRLFInputStream.java -- - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,6 @@ exception statement from your version. */ package gnu.java.net; import java.io.BufferedInputStream; -import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; @@ -49,7 +48,7 @@ import java.io.InputStream; * @author Chris Burdess (dog@gnu.org) */ public class CRLFInputStream - extends FilterInputStream + extends InputStream { /** * The CR octet. @@ -61,6 +60,11 @@ public class CRLFInputStream */ public static final int LF = 10; + /** + * The underlying input stream. + */ + protected InputStream in; + private boolean doReset; /** @@ -69,7 +73,7 @@ public class CRLFInputStream */ public CRLFInputStream(InputStream in) { - super(in.markSupported() ? in : new BufferedInputStream(in)); + this.in = in.markSupported() ? in : new BufferedInputStream(in); } /** |