re PR libgcj/6301 (gij -jar does not work)
* 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:
parent
8e8c38cddd
commit
479060323b
2 changed files with 12 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue