--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java	Mon Oct 22 14:41:51 2018 -0700
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java	Mon Oct 22 17:00:04 2018 -0700
@@ -2135,7 +2135,7 @@
                 switch (typeCodes[i]) {
                     case 'L':
                     case '[':
-                        vals[offsets[i]] = unsafe.getObject(obj, readKeys[i]);
+                        vals[offsets[i]] = unsafe.getReference(obj, readKeys[i]);
                         break;
 
                     default:
@@ -2190,7 +2190,7 @@
                                 obj.getClass().getName());
                         }
                         if (!dryRun)
-                            unsafe.putObject(obj, key, val);
+                            unsafe.putReference(obj, key, val);
                         break;
 
                     default: