# HG changeset patch
# User igerasim
# Date 1429531636 -10800
# Node ID 7e8459e7a45cb5b49de376893e3a95bfa92d0325
# Parent  e0bf010f895b842e11a78db44871c7bcc8a7ac57
8076401: Serialize OIS data
Reviewed-by: alanb, chegar

diff -r e0bf010f895b -r 7e8459e7a45c src/share/classes/java/io/ObjectInputStream.java
--- 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
@@ -1887,10 +1887,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();
@@ -1924,6 +1923,7 @@
                 } else {
                     defaultReadFields(obj, slotDesc);
                 }
+
                 if (slotDesc.hasWriteObjectData()) {
                     skipCustomData();
                 } else {