diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-30 23:55:57 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-30 23:55:57 +0000 |
| commit | 1d57bc9181cb930cec4f8e4c8a527ab510250925 (patch) | |
| tree | fd7baf78504564227e961793de647ec1fa2ce0c6 /libjava | |
| parent | d1fefebc7e63f0522c29a4c59eda6b40ecad9d9a (diff) | |
| download | ppe42-gcc-1d57bc9181cb930cec4f8e4c8a527ab510250925.tar.gz ppe42-gcc-1d57bc9181cb930cec4f8e4c8a527ab510250925.zip | |
* java/io/BufferedReader.java (fill): Handle case where markPos
point to ignored \n. Fixes PR libgcj/6301.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52982 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/io/BufferedReader.java | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7aaf7121fa0..9a0891bde09 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-04-30 Tom Tromey <tromey@redhat.com> + + * java/io/BufferedReader.java (fill): Handle case where markPos + point to ignored \n. Fixes PR libgcj/6301. + 2002-04-29 Gerhard Tonn <GerhardTonn@swol.de> * java/lang/ieeefp.h: Define __IEEE_BIG_ENDIAN for S/390. diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java index b3a7bed6157..b4cdb639b43 100644 --- a/libjava/java/io/BufferedReader.java +++ b/libjava/java/io/BufferedReader.java @@ -1,5 +1,5 @@ /* BufferedReader.java - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -355,7 +355,12 @@ public class BufferedReader extends Reader if (retAtEndOfBuffer && buffer[pos] == '\n') { --count; - pos++; + // If the mark was set to the location of the \n, then we + // must change it to fully pretend that the \n does not + // exist. + if (markPos == pos) + ++markPos; + ++pos; } return count; |
