diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-10-05 02:44:18 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-10-05 02:44:18 +0000 |
| commit | 2799793789d5b66c90efbd1a3eb56e0c1ec57f88 (patch) | |
| tree | 9157197f502b6830af9cafe029fd3d47628a7ed6 /java/io/ObjectStreamClass.java | |
| parent | 7516107c5abe26f7a4378017344eb9e449ebc28e (diff) | |
| download | classpath-2799793789d5b66c90efbd1a3eb56e0c1ec57f88.tar.gz | |
2006-10-05 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics for 2006/09/03-2006/10/04.
Diffstat (limited to 'java/io/ObjectStreamClass.java')
| -rw-r--r-- | java/io/ObjectStreamClass.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/io/ObjectStreamClass.java b/java/io/ObjectStreamClass.java index 21a80c392..52a1ad428 100644 --- a/java/io/ObjectStreamClass.java +++ b/java/io/ObjectStreamClass.java @@ -323,8 +323,8 @@ public class ObjectStreamClass implements Serializable else { // Check that the actual UID of the resolved class matches the UID from - // the stream. - if (uid != class_uid) + // the stream. Mismatches for array classes are ignored. + if (!cl.isArray() && uid != class_uid) { String msg = cl + ": Local class not compatible: stream serialVersionUID=" |