aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/io/ObjectStreamClass.java
AgeCommit message (Collapse)AuthorFilesLines
2005-11-16[multiple changes]Mark Wielaard1-977/+0
2005-11-15 Jeroen Frijters <jeroen@frijters.net> * java/io/ObjectInputStream.java (parseContent): Removed bogus println and fixed bug #24422. 2005-11-15 Mark Wielaard <mark@klomp.org> * java/io/ObjectStreamClass.java: Removed, fully merged now. * sources.am: Regenerated. * Makefile.in: Regenerated. 2005-11-15 Wolfgang Baer <WBaer@gmx.de> * java/io/ObjectInputStream.java (processResolution): Pass Error, RuntimeException and ObjectStreamException through to the caller. (readObject): Documentation update. From-SVN: r107088
2005-11-15[multiple changes]Andrew Haley1-4/+52
2005-11-15 Andrew Haley <aph@redhat.com> * Merge from Classpath head: 2005-09-16 Andrew Haley <aph@redhat.com> * java/io/ObjectStreamClass.java (findAccessibleMethod): Allow protected readResolve(). Rewrite accessibility check. 2005-07-07 Jeroen Frijters <jeroen@frijters.net> * java/io/ObjectStreamClass.java (findAccessibleMethod): Added code to make method accessible. 2005-07-03 Daniel Bonniot <bonniot@users.sf.net> * java/io/ObjectStreamClass.java (inSamePackage): New private method. (findAccessibleMethod): Likewise. (cacheMethods): Lookup readResolve and writeReplace using the new findAccessibleMethod(). From-SVN: r107029
2005-06-30Update FSF addressKelley Cook1-2/+2
From-SVN: r101453
2005-02-22Check in missed file from last commit.Bryce McKinlay1-51/+51
From-SVN: r95381
2004-10-092004-10-09 Michael Koch <konqueror@gmx.de>Michael Koch1-36/+36
* java/io/CharArrayWriter.java (resize): Removed redundant 'final' modifier. * java/io/DataInputStream.java (readFully): Throw IndexOutOfBoundsException of len < 0. * java/io/FileDescriptor.java, java/io/FileInputStream.java, java/io/FileOutputStream.java, java/io/ObjectOutputStream.java, java/io/ObjectStreamClass.java, java/io/PipedInputStream.java, java/io/RandomAccessFile.java: Reorganized import statements. From-SVN: r88817
2004-09-24ObjectInputStream.java (readObject): Delegate instantation of Externalizable ↵Jeroen Frijters1-0/+49
classes to ObjectStreamClass. 2004-09-24 Jeroen Frijters <jeroen@frijters.net> * java/io/ObjectInputStream.java (readObject): Delegate instantation of Externalizable classes to ObjectStreamClass. * java/io/ObjectStreamClass.java (newInstance): New method to instantiate Externalizable (while ignoring the accessibility of the constructor). (constructor): New field to cache the constructor. From-SVN: r88019
2004-07-23Connection.java: Use GetPropertyAction for privileged getProperty calls.Bryce McKinlay1-34/+13
2004-07-23 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/net/protocol/http/Connection.java: Use GetPropertyAction for privileged getProperty calls. * java/io/ObjectOutputStream.java (getField): No longer static. Use SetAccessibleAction instead of anonymous class for doPrivileged call. (getMethod): Likewise. (setAccessible): New field. PrivilegedAction object to use when calling setAccessible. * java/io/ObjectStreamClass.java (calculateOffsets): Use SetAccessibleAction instead of anonymous class for diPrivileged call. (setFields): Likewise. (getClassUID): Likewise. (findMethod): Likewise. * gnu/java/security/action/GetPropertyAction.java: New class. * gnu/java/security/action/SetAccessibleAction.java: New class. From-SVN: r85097
2004-04-20BufferedWriter.java, [...]: Fixed javadocs all over, rename arguments to ↵Michael Koch1-11/+11
match javadocs, fixed coding style. 2004-04-20 Michael Koch <konqueror@gmx.de> * java/io/BufferedWriter.java, java/io/ByteArrayInputStream.java, java/io/CharArrayWriter.java, java/io/DataInput.java, java/io/DataInputStream.java, java/io/File.java, java/io/FilterInputStream.java, java/io/InputStream.java, java/io/InputStreamReader.java, java/io/ObjectInputStream.java, java/io/ObjectStreamClass.java, java/io/PipedInputStream.java, java/io/PipedReader.java, java/io/PushbackInputStream.java, java/io/PushbackReader.java, java/io/RandomAccessFile.java, java/io/SerializablePermission.java, java/io/StreamTokenizer.java, java/io/StringWriter.java, java/io/WriteAbortedException.java, java/io/Writer.java: Fixed javadocs all over, rename arguments to match javadocs, fixed coding style. From-SVN: r80897
2004-02-282004-02-28 Guilhem Lavaux <guilhem@kaffe.org>Guilhem Lavaux1-2/+32
* java/io/ObjectInputStream.java (readClassDescriptor): Keep elements of the mapping non null. (checkTypeConsistency): New method. (readFields): Fixed main loop and base logic. Small reindentation. * java/io/ObjectStreamField.java (lookupField): New method to update the field reference. (checkFieldType): New method. * java/io/ObjectStreamClass.java (setClass, setFields): Call lookupField when building the field database. Check the real field type. From-SVN: r78627
2004-02-06ObjectInputStream.java: Made all calls to dumpElement[ln] conditional on ↵Jeroen Frijters1-29/+92
dump flag. 2004-02-06 Jeroen Frijters <jeroen@frijters.net> * java/io/ObjectInputStream.java: Made all calls to dumpElement[ln] conditional on dump flag. (readObject): Changed to use cached info from ObjectStreamClass. (readClassDescriptor): Cache more information in ObjectStreamClass. (processResolution, readFields): Use cached info from ObjectStreamClass. (newObject): Throw exception instead of returning null for failure. (getField, getMethod, callReadMethod, setBooleanField, setByteField, setCharField, setDoubleField, setFloatField, setIntField, setLongField, setShortField, setObjectField, readObjectParams): Removed. (dumpElement, dumpElementln): Removed dump flag condition check. * java/io/ObjectStreamField.java (hasReadMethod): Removed. (setClass): Added call to cacheMethods() (findMethod): New method. (cacheMethods): New method. (ObjectStreamClass): Added call to cacheMethods(). (setFields): Cache fields. (getClassUID): Use AccessController.doPrivileged to invoke setAccessible. (readObjectMethod, readResolveMethod, realClassIsSerializable, realClassIsExternalizable, fieldMapping, firstNonSerializableParent): New fields. * java/io/ObjectStreamField.java (ObjectStreamField): New constructor. (ObjectStreamField): Removed FIXME workaround. (getTypeString, isPrimitive): Made safe for cases where type == null. (setBooleanField, setByteField, setCharField, setShortField, setIntField, setLongField, setFloatField, setDoubleField, setObjectField): New methods. From-SVN: r77395
2003-12-30ObjectInputStream.java, [...]: Reformated, no functional code changes.Michael Koch1-406/+412
2003-12-30 Michael Koch <konqueror@gmx.de> * java/io/ObjectInputStream.java, java/io/ObjectOutputStream.java, java/io/ObjectStreamClass.java: Reformated, no functional code changes. From-SVN: r75236
2003-12-232003-12-23 Guilhem Lavaux <guilhem@kaffe.org>Guilhem Lavaux1-6/+34
* java/io/ObjectInputStream.java (getField): Handle transient and non persistent fields. (readClassDescriptor): Better error handling, use the right class loader. (readFields): Fields marked as not present in the stream or not to be set are not read and set. * java/io/ObjectInputStream.java (readFields): Changed implementation of GetField. (readClassDescriptor): Documented. * java/io/ObjectOutputStream.java (writeClassDescriptor): Added condition when to write class super class information. From-SVN: r74985
2003-12-16i2003-12-16 Guilhem Lavaux <guilhem@kaffe.org>Guilhem Lavaux1-22/+101
* java/io/ObjectInputStream.java (lookupClass): New method. (currentLoader): New method. (inputGetObjectStreamClasses): New method. (assignNewHandle): Documented. (currentClassLoader): Documented. * java/io/ObjectStreamClass.java (setClass): Changed API. Better handling of the imported/exported fields. (getSerialPersistentFields): Make it throw previously caught exceptions so they can handled in setClass. From-SVN: r74693
2003-10-11Externalizable.java, [...]: Removed redundant modifiers.Michael Koch1-2/+0
2003-10-11 Michael Koch <konqueror@gmx.de> * java/io/Externalizable.java, java/io/FileFilter.java, java/io/FilePermission.java, java/io/ObjectInput.java, java/io/ObjectInputValidation.java, java/io/ObjectOutput.java, java/io/ObjectStreamClass.java, java/io/ObjectStreamConstants.java, java/io/Serializable.java: Removed redundant modifiers. From-SVN: r72352
2003-09-18Reported by Guilhem Lavaux and Julian DolbyMark Wielaard1-1/+1
2003-09-18 Mark Wielaard <mark@klomp.org> Reported by Guilhem Lavaux and Julian Dolby * java/io/ObjectStreamClass.java (getSerialPersistentFields): Get the field "serialPersistentFields", not "getSerialPersistentFields". From-SVN: r71515
2003-03-23BufferedOutputStream.java: Reformated.Michael Koch1-8/+8
2003-03-23 Michael Koch <konqueror@gmx.de> * java/io/BufferedOutputStream.java: Reformated. * java/io/BufferedReader.java: Reformated. * java/io/ByteArrayOutputStream.java (size): Fixed @see tag. * java/io/CharArrayWriter.java (size): Fixed @see tag. * java/io/DataInput.java: Reformated. * java/io/DataOutput.java: Reformated. * java/io/DataOutputStream.java: Merged copyright years with classpath. * java/io/Externalizable.java: Reformated. * java/io/FileFilter.java: Reformated. * java/io/FileInputStream.java: Merged copyright years with classpath. * java/io/FileOutputStream.java: Merged copyright years with classpath. * java/io/FilePermission.java (FilePermission): Replaced @XXX with FIXME:. * java/io/FileWriter.java: Reformated. * java/io/FilenameFilter.java: Reformated. * java/io/FilterInputStream.java: Reformated. * java/io/FilterOutputStream.java: Reformated. * java/io/FilterReader.java: Reformated. * java/io/FilterWriter.java: Reformated. * java/io/LineNumberInputStream.java (LineNumberInputStream): Replaced @code with HTML tags to make javadoc happy. (getLineNumber): Fixed @return tag. * java/io/ObjectInput.java: Reformated. * java/io/ObjectOutput.java: Reformated. * java/io/ObjectStreamClass.java: Reformated. * java/io/PrintStream.java: Merged copyright years with classpath. * java/io/PushbackReader.java (PushbackReader): Replaced @code with @param. * java/io/SerializablePermission.java: Reformated. * java/io/StreamTokenizer.java (resetSyntax): Fixed @see tag. From-SVN: r64748
2003-03-14ObjectInputStream.java (readObject): Cleaned up the class hierarchy loop.Jeroen Frijters1-0/+22
2003-02-14 Jeroen Frijters <jeroen@sumatra.nl> * java/io/ObjectInputStream.java (readObject): Cleaned up the class hierarchy loop. (readFields(Object,ObjectStreamField[],boolean)): Changed argument list to Object,ObjectStreamClass, moved callReadMethod code up into readObject and added Class argument to all setXxxField calls. (callReadMethod): Changed Class argument to ObjectStreamClass to be consistent with ObjectOutputStream and to facilitate caching the Method in the future. (setBooleanField): Added Class argument. (setByteField): Likewise. (setCharField): Likewise. (setDoubleField): Likewise. (setFloatField): Likewise. (setIntField): Likewise. (setLongField): Likewise. (setShortField): Likewise. (setObjectField): Likewise. * java/io/ObjectOutputStream.java (writeObject): Cleaned up the class hierarchy loop. (defaultWriteObject): Call writeFields with new argument list. (writeFields(Object,ObjectStreamField[],boolean): Changed argument list to Object,ObjectStreamClass, moved callWriteMethod up into writeObject and added Class argument to all getXxxField calls. (callWriteMethod): Added ObjectStreamClass argument to be able to get the proper class to call getMethod on (each class can have (or not have) its own writeObject method). (getBooleanField): Added Class argument. (getByteField): Likewise. (getCharField): Likewise. (getDoubleField): Likewise. (getFloatField): Likewise. (getIntField): Likewise. (getLongField): Likewise. (getShortField): Likewise. (getObjectField): Likewise. * java/io/ObjectStreamClass.java (hasReadMethod): Added method to facilitate caching the Method object in the future. From-SVN: r64351
2003-01-20Makefile.am (core_java_source_files): Add VMObjectStreamClass.java.Mark Wielaard1-26/+1
* Makefile.am (core_java_source_files): Add VMObjectStreamClass.java. (nat_source_files): Add natVMObjectStreamClass.cc. * Makefile.in: Regenerated. * gcj/javaprims.h (namespace java): Regenerated. * java/io/ObjectStreamClass.java (getClassUID): Call VMObjectStreamClass.hasClassInitializer(). (hasClassInitializer): Removed. * java/io/VMObjectStreamClass.java: New class. * java/io/natVMObjectStreamClass.cc: New file. * java/lang/Class.h: Make java::io::VMObjectStreamClass friend class. From-SVN: r61501
2003-01-04Merge with Classpath:Mark Wielaard1-43/+67
* java/io/ObjectStreamClass.java (lookup): Split method and call lookupForClassObject(). (lookupForClassObject): New method. (isProxyClass): New field. (setClass): Set isProxyClass, add object to classLookupTable, set superClass and calculateOffsets. (ObjectStreamClass): Set isProxyClass. Only set uid when Serializable and not a proxy class. (setFields): Set accessible true for serialPersistentFields. (getClassUID): Same for suid. And check if suid is of type long. (hasClassInitializer): Don't throw NoSuchMethodError. From-SVN: r60867
2002-01-22Add license clarification.Mark Wielaard1-5/+16
From-SVN: r49104
2001-04-26re PR libgcj/2237 (serialization doesn't throw exception on failure)Bryce McKinlay1-40/+29
Fix PR libgcj/2237: * java/io/ObjectStreamClass.java (setClass): Calculate serialVersionUID for local class and compare it against the UID from the Object Stream. Throw InvalidClassException upon mismatch. (setUID): Renamed to... (getClassUID): this. Return the calculated class UID rather than setting uid field directly. (getDefinedSUID): Removed. * java/io/ObjectInputStream.java (resolveClass): Use the three-argument Class.forName(). * java/io/InvalidClassException (toString): Don't include classname in result if it is null. From-SVN: r41567
2001-03-09re PR libgcj/1971 (ObjectOutputStream generates incorrect serialVersionUID's ↵Tom Tromey1-5/+9
for array classes) * java/io/ObjectStreamClass.java (setUID): Don't write interface info for array classes. Fixes PR libgcj/1971. From-SVN: r40337
2001-01-06Fix comments for docletsAnthony Green1-2/+2
From-SVN: r38754
2000-09-08PropertyChangeEvent.java (serialVersionUID): Added.Warren Levy1-0/+4
* java/beans/PropertyChangeEvent.java (serialVersionUID): Added. * java/beans/PropertyVetoException.java (serialVersionUID): Added. * java/io/File.java (writeObject): Added. (readObject): Added. (serialVersionUID): Added. * java/io/ObjectOutputStream.java (writeObject): Initialized fieldsAlreadyWritten before recursion rather than after. * java/io/ObjectStreamClass.java (serialVersionUID): Added. * java/io/OptionalDataException.java (serialVersionUID): Added. (OptionalDataException): Made package private. * java/io/SyncFailedException.java (SyncFailedException): Removed default constructor to match spec. * java/lang/Boolean.java (serialVersionUID): Added. * java/lang/Byte.java (serialVersionUID): Added. * java/lang/Character.java (serialVersionUID): Added. * java/lang/Double.java (serialVersionUID): Added. * java/lang/Float.java (serialVersionUID): Added. * java/lang/Integer.java (serialVersionUID): Added. * java/lang/Long.java (serialVersionUID): Added. * java/lang/Number.java (serialVersionUID): Added. * java/lang/Short.java (serialVersionUID): Added. * java/lang/String.java (serialVersionUID): Added. * java/lang/ThreadDeath.java (ThreadDeath): Removed constructor to match spec. * java/lang/reflect/InvocationTargetException.java (serialVersionUID): Added. * java/net/URL.java (handler): Made transient. (hashCode): Added field for serialization, per spec. and use cached value if available. (serialVersionUID): Added. (URL): Initialize hashCode. (set): Adjust hashCode. (readObject): New Method to initialize the protocol handler when deserializing. (writeObject): New method. * java/text/BreakIterator.java: Removed 'implements Serializable'. * java/text/Collator.java: Removed 'implements Serializable'. * java/util/GregorianCalendar.java (serialVersionUID): Added. * java/util/Properties.java (serialVersionUID): Added. * java/util/Random.java (serialVersionUID): Added. (seed): Made private. (nextNextGaussian): Made private. (haveNextNextGaussian): Made private. * java/util/Stack.java (serialVersionUID): Added. * java/util/TimeZone.java (serialVersionUID): Added. * java/util/Vector.java (serialVersionUID): Added. Serialization mods. From-SVN: r36272
2000-08-04ObjectInputStream.java (readFields): Turn off readDataFromBlock while ↵Warren Levy1-7/+7
reading via GetField. * java/io/ObjectInputStream.java (readFields): Turn off readDataFromBlock while reading via GetField. (GetField$1.get(String, Object)): Pass Class of default value to getField. (getField): Allow for null default values. * java/io/ObjectOutputStream.java: Fixed typo in comment. (PutField$1.put): Fixed calls of checkType in most of the put methods to pass the correct parameter. (PutField$1.put(String, Object)): Allow for null value arg. (PutField$1.write): Turn off writeDataAsBlocks while writing via PutField. * java/io/ObjectStreamClass.java (serialPersistentFields): Fixed typo in spec'ed field name. (getSerialPersistentFields): Changed spelling of method to match the correct spelling of the spec'ed field name. More serialization fixes per Mauve errors. From-SVN: r35468
2000-07-27mauve-libgcj: Activated serialization tests.Warren Levy1-7/+7
* mauve-libgcj: Activated serialization tests. * gcj/field.h (getModifiers): Mask off unknown flags. * gnu/java/security/provider/SHA.java (munch): Reset buffer to 0 so spurious bits don't cause discrepancies. * java/io/ObjectOutputStream.java: Fixed typo in comment. * java/io/ObjectStreamClass.java: Fixed typos in comments. (lookup): Applied patch from Brian Jones <cbj@gnu.org> to optimize. (hasClassInitializer): Call getDeclaredMethod instead of getMethod. * java/lang/Throwable.java (serialVersionUID): New field. * java/lang/reflect/Modifier.java (ALL_FLAGS): Preserve STRICT if used. * java/lang/reflect/natConstructor.cc (getModifiers): Mask off unknown flags. * java/lang/reflect/natMethod.cc: Ditto. * java/security/Key.java (serialVersionUID): Removed field for now. * java/security/interfaces/DSAPrivateKey.java (serialVersionUID): Ditto. * java/security/interfaces/DSAPublicKey.java (serialVersionUID): Ditto. Serialization mods. From-SVN: r35302
2000-06-28Gnu.java: New file.Warren Levy1-7/+9
* gnu/java/security/provider/Gnu.java: New file. * gnu/java/security/provider/SHA.java: New file. * gnu/java/security/provider/SHA1PRNG.java: New file. * Makefile.am: Added the above files. * Makefile.in: Rebuilt. * java/io/ObjectStreamClass.java (setUID): Use Gnu SHA instead of SHS. From-SVN: r34753
2000-05-19Jumbo patch:Tom Tromey1-0/+666
* Imported beans and serialization * Updated IA-64 port * Miscellaneous bug fixes From-SVN: r34028
generated by cgit v1.1 at 2025-04-08 12:13:46 +0000