diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 17:50:18 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 17:50:18 -0400 |
| commit | b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99 (patch) | |
| tree | d7ba286aab6e1ef507277111026c9d037db88003 | |
| parent | ffa33efc2cae574aefbc2867dd4a7e5413282e3c (diff) | |
| parent | 9899be9d275082095c2bf6f89ddbfd49fc53227b (diff) | |
| download | android_dalvik-b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99.tar.gz android_dalvik-b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99.tar.bz2 android_dalvik-b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99.zip | |
Merge change I9899be9d into eclair
* changes:
Fixing a Harmony regression in ObjectInputStream.
| -rw-r--r-- | libcore/luni/src/main/java/java/io/ObjectInputStream.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libcore/luni/src/main/java/java/io/ObjectInputStream.java b/libcore/luni/src/main/java/java/io/ObjectInputStream.java index 7dc87ffea..6d24eb282 100644 --- a/libcore/luni/src/main/java/java/io/ObjectInputStream.java +++ b/libcore/luni/src/main/java/java/io/ObjectInputStream.java @@ -1323,7 +1323,13 @@ public class ObjectInputStream extends InputStream implements ObjectInput, } if (fieldDesc != null) { if (toSet != null) { - Class<?> fieldType = fieldDesc.getType(); + // BEGIN android-changed + // Get the field type from the local field rather than + // from the stream's supplied data. That's the field + // we'll be setting, so that's the one that needs to be + // validated. + Class<?> fieldType = field.getTypeInternal(); + // END android-added Class<?> valueType = toSet.getClass(); if (!fieldType.isAssignableFrom(valueType)) { throw new ClassCastException(Msg.getString( |