Mercurial > hg > release > icedtea7-forest-2.5 > jdk
changeset 8203:ab54d7eeaa64
8076401: Serialize OIS data
Reviewed-by: alanb, chegar
author | igerasim |
---|---|
date | Mon, 20 Apr 2015 15:07:16 +0300 |
parents | d97b57cab020 |
children | d27f6f77faf1 |
files | src/share/classes/java/io/ObjectInputStream.java |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/io/ObjectInputStream.java Mon Apr 20 15:17:22 2015 +0300 +++ b/src/share/classes/java/io/ObjectInputStream.java Mon Apr 20 15:07:16 2015 +0300 @@ -1884,10 +1884,9 @@ ObjectStreamClass slotDesc = slots[i].desc; if (slots[i].hasData) { - if (obj != null && - slotDesc.hasReadObjectMethod() && - handles.lookupException(passHandle) == null) - { + if (obj == null || handles.lookupException(passHandle) != null) { + defaultReadFields(null, slotDesc); // skip field values + } else if (slotDesc.hasReadObjectMethod()) { SerialCallbackContext oldContext = curContext; if (oldContext != null) oldContext.check(); @@ -1921,6 +1920,7 @@ } else { defaultReadFields(obj, slotDesc); } + if (slotDesc.hasWriteObjectData()) { skipCustomData(); } else {