This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Remove BlockDataException
- To: java-patches at gcc dot gnu dot org
- Subject: Remove BlockDataException
- From: Bryce McKinlay <bryce at albatross dot co dot nz>
- Date: Tue, 13 Feb 2001 20:45:11 +1300
This class doesn't exist in the JCL or JDK docs. This patch removes
it.
regards
[ bryce ]
2001-02-13 Bryce McKinlay <bryce@albatross.co.nz>
* java/io/BlockDataException.java: Removed.
* java/io/ObjectInputStream.java (readObject): Throw
StreamCorruptedException, not BlockDataException.
* Makefile.am: Remove BlockDataException.
* Makefile.in: Rebuild.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libjava/Makefile.am,v
retrieving revision 1.129
diff -u -r1.129 Makefile.am
--- Makefile.am 2001/01/31 17:12:25 1.129
+++ Makefile.am 2001/02/13 07:36:08
@@ -857,7 +857,6 @@
java/lang/VerifyError.java \
java/lang/VirtualMachineError.java \
java/lang/Void.java \
-java/io/BlockDataException.java \
java/io/BufferedInputStream.java \
java/io/BufferedOutputStream.java \
java/io/BufferedReader.java \
@@ -982,10 +981,11 @@
java/util/Timer.java \
java/util/TimerTask.java \
java/util/TooManyListenersException.java \
+#java/util/WeakHashMap.java \
java/util/Vector.java
-#java/util/WeakHashmap.java
+
## List of all .java files to be compiled. Please keep this list
## alphabetical. Please put files from java/lang, java/io, and java/util
## into core_java_source_files. Please put files from gnu/gcj/convert
@@ -1205,6 +1205,7 @@
java/util/zip/ZipOutputStream.java \
$(awt_java_source_files) \
$(convert_source_files)
+
java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvs/gcc/egcs/libjava/java/io/ObjectInputStream.java,v
retrieving revision 1.6
diff -u -r1.6 ObjectInputStream.java
--- ObjectInputStream.java 2001/01/27 06:04:29 1.6
+++ ObjectInputStream.java 2001/02/13 07:36:08
@@ -135,7 +135,7 @@
else
dumpElementln ("BLOCKDATA");
readNextBlock (marker);
- throw new BlockDataException (this.blockDataBytes);
+ throw new StreamCorruptedException ("Unexpected blockData");
case TC_NULL:
dumpElementln ("NULL");