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

	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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 43ce2e0ee97945e68ca25bad470b3b3837993c42..6e0a7b96123edcc8719b41eafacfea5034e88346 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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:

diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java
index 73876fbd69140f11ded5d2c3a08c7fa0c23e31fe..03a0c3e862e13a0b9ae7a55b4e522695e9a9ea13 100644 (file)
--- a/libjava/java/io/InputStreamReader.java
+++ b/libjava/java/io/InputStreamReader.java
@@ -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++];