mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-11 05:23:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR libgcj/6301 (gij -jar does not work)

Browse Source 
* java/io/BufferedReader.java (fill): Handle case where markPos
	point to ignored \n.  Fixes PR libgcj/6301.

From-SVN: r52982
This commit is contained in:
Tom Tromey 2002-04-30 23:55:57 +00:00 committed by Tom Tromey
parent 8e8c38cddd
commit 479060323b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

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

9
libjava/java/io/BufferedReader.java
View File

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