FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BlockDataException.java: Removed.

Browse source 
* java/io/BlockDataException.java: Removed.
	* java/io/ObjectInputStream.java (readObject): Throw
	StreamCorruptedException, not BlockDataException.
	* Makefile.am: Remove BlockDataException.
	* Makefile.in: Rebuild.

From-SVN: r39616
This commit is contained in:
Bryce McKinlay 2001-02-13 07:42:48 +00:00 • committed by Bryce McKinlay
parent 5b0d91c392
commit 7eecbdb322
5 changed files with 33 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/ChangeLog
View file

@ -1,3 +1,11 @@
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.
2001-02-12 Jeff Sturm <jeff.sturm@commerceone.com> 2001-02-12 Jeff Sturm <jeff.sturm@commerceone.com>
Tom Tromey <tromey@redhat.com> Tom Tromey <tromey@redhat.com>

4
libjava/Makefile.am
View file

@ -857,7 +857,6 @@ java/lang/UnsupportedOperationException.java \
java/lang/VerifyError.java \ java/lang/VerifyError.java \
java/lang/VirtualMachineError.java \ java/lang/VirtualMachineError.java \
java/lang/Void.java \ java/lang/Void.java \
java/io/BlockDataException.java \
java/io/BufferedInputStream.java \ java/io/BufferedInputStream.java \
java/io/BufferedOutputStream.java \ java/io/BufferedOutputStream.java \
java/io/BufferedReader.java \ java/io/BufferedReader.java \
@ -983,7 +982,7 @@ java/util/Timer.java \
java/util/TimerTask.java \ java/util/TimerTask.java \
java/util/TooManyListenersException.java \ java/util/TooManyListenersException.java \
java/util/Vector.java java/util/Vector.java
#java/util/WeakHashmap.java #java/util/WeakHashMap.java \
## List of all .java files to be compiled. Please keep this list ## List of all .java files to be compiled. Please keep this list
@ -1206,6 +1205,7 @@ java/util/zip/ZipOutputStream.java \
$(awt_java_source_files) \ $(awt_java_source_files) \
$(convert_source_files) $(convert_source_files)
java_source_files = $(special_java_source_files) $(ordinary_java_source_files) java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
## Math library: C, not C++ ## Math library: C, not C++

63
libjava/Makefile.in
View file

@ -75,7 +75,6 @@ DIVIDESPEC = @DIVIDESPEC@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXCEPTIONSPEC = @EXCEPTIONSPEC@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FORCELIBGCCSPEC = @FORCELIBGCCSPEC@
GCDEPS = @GCDEPS@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
@ -120,43 +119,29 @@ here = @here@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
AUTOMAKE_OPTIONS = foreign no-installinfo AUTOMAKE_OPTIONS = foreign no-installinfo
@TESTSUBDIR_TRUE@SUBDIRS = \ @TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
@TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include @TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
@TESTSUBDIR_FALSE@SUBDIRS = \ @USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
@TESTSUBDIR_FALSE@$(DIRLTDL) gcj include @USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
@USE_LIBDIR_TRUE@toolexeclibdir = \ @USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) @NO_X_TRUE@cond_x_ltlibrary =
@USE_LIBDIR_FALSE@toolexeclibdir = \ @NO_X_FALSE@cond_x_ltlibrary = @NO_X_FALSE@libgcjx.la
@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexecdir = \
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
@NO_X_TRUE@cond_x_ltlibrary = \
@NO_X_FALSE@cond_x_ltlibrary = \
@NO_X_FALSE@libgcjx.la
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
toolexeclib_DATA = libgcj.spec toolexeclib_DATA = libgcj.spec
data_DATA = libgcj.jar data_DATA = libgcj.jar
@NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = \ @NEEDS_DATA_START_TRUE@toolexeclib_LIBRARIES = @NEEDS_DATA_START_TRUE@libgcjdata.a
@NEEDS_DATA_START_TRUE@libgcjdata.a @NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = @NEEDS_DATA_START_TRUE@libgcjdata.c
@NEEDS_DATA_START_TRUE@libgcjdata_a_SOURCES = \
@NEEDS_DATA_START_TRUE@libgcjdata.c
@NATIVE_TRUE@bin_PROGRAMS = \ @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij
@NATIVE_TRUE@jv-convert gij
bin_SCRIPTS = addr2name.awk bin_SCRIPTS = addr2name.awk
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \ @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT) @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \ @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
@CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar @CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
@CANADIAN_FALSE@ZIP = \ @CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
@CANADIAN_TRUE@GCJH = \
@CANADIAN_TRUE@gcjh
@CANADIAN_FALSE@GCJH = \
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
@ -175,10 +160,8 @@ AM_CXXFLAGS = -fno-rtti -fvtable-thunks -fasynchronous-exceptions \
-fdollars-in-identifiers \ -fdollars-in-identifiers \
@LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE
@USING_GCC_TRUE@AM_CFLAGS = \ @USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
@USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
@USING_GCC_FALSE@AM_CFLAGS = \
@USING_GCC_FALSE@@LIBGCJ_CFLAGS@
JCFLAGS = -g JCFLAGS = -g
JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@ JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
@ -250,8 +233,7 @@ extra_headers = java/lang/Object.h java/lang/Class.h
NM = nm NM = nm
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \ @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
CONVERT_DIR = gnu/gcj/convert CONVERT_DIR = gnu/gcj/convert
@ -619,7 +601,6 @@ java/lang/UnsupportedOperationException.java \
java/lang/VerifyError.java \ java/lang/VerifyError.java \
java/lang/VirtualMachineError.java \ java/lang/VirtualMachineError.java \
java/lang/Void.java \ java/lang/Void.java \
java/io/BlockDataException.java \
java/io/BufferedInputStream.java \ java/io/BufferedInputStream.java \
java/io/BufferedOutputStream.java \ java/io/BufferedOutputStream.java \
java/io/BufferedReader.java \ java/io/BufferedReader.java \
@ -746,7 +727,7 @@ java/util/TimerTask.java \
java/util/TooManyListenersException.java \ java/util/TooManyListenersException.java \
java/util/Vector.java java/util/Vector.java
#java/util/WeakHashmap.java #java/util/WeakHashMap.java \
ordinary_java_source_files = $(core_java_source_files) \ ordinary_java_source_files = $(core_java_source_files) \
gnu/gcj/RawData.java \ gnu/gcj/RawData.java \
@ -1215,7 +1196,7 @@ libgcj-test.spec.in libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
@ -1468,7 +1449,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/beans/beancontext/BeanContextServiceRevokedListener.P \ .deps/java/beans/beancontext/BeanContextServiceRevokedListener.P \
.deps/java/beans/beancontext/BeanContextServices.P \ .deps/java/beans/beancontext/BeanContextServices.P \
.deps/java/beans/beancontext/BeanContextServicesListener.P \ .deps/java/beans/beancontext/BeanContextServicesListener.P \
.deps/java/io/BlockDataException.P .deps/java/io/BufferedInputStream.P \ .deps/java/io/BufferedInputStream.P \
.deps/java/io/BufferedOutputStream.P .deps/java/io/BufferedReader.P \ .deps/java/io/BufferedOutputStream.P .deps/java/io/BufferedReader.P \
.deps/java/io/BufferedWriter.P .deps/java/io/ByteArrayInputStream.P \ .deps/java/io/BufferedWriter.P .deps/java/io/ByteArrayInputStream.P \
.deps/java/io/ByteArrayOutputStream.P .deps/java/io/CharArrayReader.P \ .deps/java/io/ByteArrayOutputStream.P .deps/java/io/CharArrayReader.P \
@ -2118,7 +2099,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \ cp -pr $$d/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \

39
libjava/java/io/BlockDataException.java
View file

@ -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" );
}
}

2
libjava/java/io/ObjectInputStream.java
View file

@ -135,7 +135,7 @@ public class ObjectInputStream extends InputStream
else else
dumpElementln ("BLOCKDATA"); dumpElementln ("BLOCKDATA");
readNextBlock (marker); readNextBlock (marker);
throw new BlockDataException (this.blockDataBytes); throw new StreamCorruptedException ("Unexpected blockData");
case TC_NULL: case TC_NULL:
dumpElementln ("NULL"); dumpElementln ("NULL");