diff options
author | Roman Kennke <roman@kennke.org> | 2006-08-21 09:27:50 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2006-08-21 09:27:50 +0000 |
commit | df85d7770fa993810394a6c05c2c1a2714c01e7a (patch) | |
tree | ac8741bd43f4fef8d355753ac9ea73b328025191 /java/io/ObjectStreamField.java | |
parent | 16897bc74303190427ca0a99963620463144d5e9 (diff) | |
download | classpath-df85d7770fa993810394a6c05c2c1a2714c01e7a.tar.gz |
2006-08-21 Friedjof Siebert <siebert@aicas.com>
* java/io/ObjectInputStream.java
(objectLookupTable): Changed to be a Vector.
(ObjectInputStream): Initialize objectLookupTable as Vector.
(assignNewHandle): Store Object using handle index rather than
Hashtable, using the new rememberHandle() method.
(hierarchy): New method. This replaces inputGetObjectStreamClasses()
with a caching in ObjectStreamClass.
(inputGetObjectStreamClass): Replaced by hierarchy().
(lookupHandle): New method. Looks up an object by it's handle
index.
(parseContent): Avoid creating of Integer objects. Use
hierarchy() method for looking up the class hierarchy.
(processResolution): Use rememberHandle() to store
handle per index, rather than Hashtabling the object.
(readFields):
(rememberHandle): New method.
* java/io/ObjectOutputStream.java
(OIDLookupTable): Use ObjectIdentityMap2Int instead of
Hashtable for improved lookup performance.
(ObjectOutputStream): Initialize OIDLookupTable as
ObjectIdentityMap2Int.
(assignNewHandle): Change to use ObjectIdentityMap2Int.
(findHandle): Change to use ObjectIdentityMap2Int.
(getBooleanField): Removed.
(getByteField): Removed.
(getCharField): Removed.
(getDoubleField): Removed.
(getField): Removed.
(getFloatField): Removed.
(getIntField): Removed.
(getLongField): Removed.
(getObjectField): Removed.
(writeFields(Object,ObjectStreamClass)): Use new helper method.
(writeFields(Object,ObjectStreamField)): New helper method.
Use switch rather then if-else cascade.
(writeObject): Use int handle, rather then Integer.
* java/io/ObjectStreamClass.java
(hierarchy): New field. Caches the class hierarchy.
(methodCache): New field. Caches methods.
(readObjectSignature): New field. Stores the read signature.
(uidCache): New field. Caches UIDs.
(writeObjectSignature): New field. Stores the write signature.
(cacheMethods): Cache methods in methodCache.
(calculateClassID): Outsourced from getClassUID()
for computing the UIDs.
(getClassUIDFromField): Outsourced from getClassUID() for
fetching the UID from the class field.
(getClassUID): Use cached uid if possible. Use new helper
methods for fetching the UID from the field or computing
from scratch.
(getObjectStreamClasses): Removed. Replaced by more
efficient hierarchy() method, that also caches the result.
(hierarchy): Replaces getObjectStreamClasses() for caching
the result.
(loadedByBootOrApplicationClassLoader): New helper method.
(setClass): Invalidate hierarchy cache.
(setSuperclass): Invalidate hierarchy cache.
* java/io/ObjectStreamField.java
(field): Made field package private for access from other
classes.
* gnu/java/io/ObjectIdentityWrapper.java: Removed.
* gnu/java/io/ObjectIdentityMap2Int.java: Efficient
hashtable for mapping objects to ints.
Diffstat (limited to 'java/io/ObjectStreamField.java')
-rw-r--r-- | java/io/ObjectStreamField.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/io/ObjectStreamField.java b/java/io/ObjectStreamField.java index fbb1381dc..4d6eb7f1d 100644 --- a/java/io/ObjectStreamField.java +++ b/java/io/ObjectStreamField.java @@ -58,7 +58,7 @@ public class ObjectStreamField implements Comparable private boolean unshared; private boolean persistent = false; private boolean toset = true; - private Field field; + Field field; ObjectStreamField (Field field) { |