src/java.base/share/classes/java/io/ObjectStreamClass.java

@@ -2133,11 +2133,11 @@
              */
             for (int i = numPrimFields; i < fields.length; i++) {
                 switch (typeCodes[i]) {
                     case 'L':
                     case '[':
-                        vals[offsets[i]] = unsafe.getObject(obj, readKeys[i]);
+                        vals[offsets[i]] = unsafe.getReference(obj, readKeys[i]);
                         break;
 
                     default:
                         throw new InternalError();
                 }

@@ -2188,11 +2188,11 @@
                                 f.getName() + " of type " +
                                 f.getType().getName() + " in instance of " +
                                 obj.getClass().getName());
                         }
                         if (!dryRun)
-                            unsafe.putObject(obj, key, val);
+                            unsafe.putReference(obj, key, val);
                         break;
 
                     default:
                         throw new InternalError();
                 }