MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/1913 (reading closed streams throws NullPointerException, not IOException)

Browse Source 
From paul@dawa.demon.co.uk.  Fix for PR libgcj/1913:
	* java/io/InputStreamReader.java (ready, read): Throw IOException
	if stream has been closed.

From-SVN: r39553
This commit is contained in:
Tom Tromey 2001-02-09 01:54:38 +00:00 committed by Tom Tromey
parent 1b43b6be4a
commit 8a5f950e04
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2001-02-08 Tom Tromey <tromey@redhat.com>
From paul@dawa.demon.co.uk. Fix for PR libgcj/1913:
* java/io/InputStreamReader.java (ready, read): Throw IOException
if stream has been closed.
2001-02-08 Joseph S. Myers <jsm28@cam.ac.uk>
* README, gij.cc, java/lang/natClass.cc, java/lang/natSystem.cc:

11
libjava/java/io/InputStreamReader.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1998, 1999 Free Software Foundation
/* Copyright (C) 1998, 1999, 2001 Free Software Foundation
This file is part of libgcj.
@ -71,6 +71,9 @@ public class InputStreamReader extends Reader
{
synchronized (lock)
{
if (in == null)
throw new IOException("Stream closed");
if (wpos < wcount)
return true;
if (work == null)
@ -102,6 +105,9 @@ public class InputStreamReader extends Reader
{
synchronized (lock)
{
if (in == null)
throw new IOException("Stream closed");
int wavail = wcount - wpos;
if (wavail > 0)
{
@ -136,6 +142,9 @@ public class InputStreamReader extends Reader
{
synchronized (lock)
{
if (in == null)
throw new IOException("Stream closed");
int wavail = wcount - wpos;
if (wavail > 0)
return work[wpos++];