aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/io
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@albatross.co.nz>2001-02-13 07:42:48 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2001-02-13 07:42:48 +0000
commit7eecbdb3226682bbf5e5094c1d69a73f86bc2986 (patch)
treec7f05554b9cf233b87ecc9705a030ae771935b9e /libjava/java/io
parent5b0d91c39237f6a45dcb229620bbf5c144b29c62 (diff)
downloadgcc-7eecbdb3226682bbf5e5094c1d69a73f86bc2986.zip
gcc-7eecbdb3226682bbf5e5094c1d69a73f86bc2986.tar.gz
gcc-7eecbdb3226682bbf5e5094c1d69a73f86bc2986.tar.bz2
BlockDataException.java: Removed.
* java/io/BlockDataException.java: Removed. * java/io/ObjectInputStream.java (readObject): Throw StreamCorruptedException, not BlockDataException. * Makefile.am: Remove BlockDataException. * Makefile.in: Rebuild. From-SVN: r39616
Diffstat (limited to 'libjava/java/io')
-rw-r--r--libjava/java/io/BlockDataException.java39
-rw-r--r--libjava/java/io/ObjectInputStream.java2
2 files changed, 1 insertions, 40 deletions
diff --git a/libjava/java/io/BlockDataException.java b/libjava/java/io/BlockDataException.java
deleted file mode 100644
index ef70f54..0000000
--- a/libjava/java/io/BlockDataException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* BlockDataException.java -- Class used to store name and class of fields
- Copyright (C) 1998 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-As a special exception, if you link this library with other files to
-produce an executable, this library does not by itself cause the
-resulting executable to be covered by the GNU General Public License.
-This exception does not however invalidate any other reasons why the
-executable file might be covered by the GNU General Public License. */
-
-
-package java.io;
-
-//TODO: check 1.2 API to make sure this mathces
-
-class BlockDataException extends IOException
-{
- public BlockDataException( int bytes )
- {
- super( bytes + " bytes are available in the next data block" );
- }
-}
-
diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java
index 9c10d58..028ed39 100644
--- a/libjava/java/io/ObjectInputStream.java
+++ b/libjava/java/io/ObjectInputStream.java
@@ -135,7 +135,7 @@ public class ObjectInputStream extends InputStream
else
dumpElementln ("BLOCKDATA");
readNextBlock (marker);
- throw new BlockDataException (this.blockDataBytes);
+ throw new StreamCorruptedException ("Unexpected blockData");
case TC_NULL:
dumpElementln ("NULL");