Only deep reset if default object is of the same type as current and …

…is not null Change API to remove redundant defaults param Revert "Disable deep resetting for object fields #745" This reverts commit 96bcb58.
OpenHFT · Oct 30, 2023 · cb3bf80 · cb3bf80
1 parent 4375e97
commit cb3bf80
Show file tree

Hide file tree

Showing 6 changed files with 287 additions and 153 deletions.
diff --git a/src/main/java/net/openhft/chronicle/wire/AbstractMarshallableCfg.java b/src/main/java/net/openhft/chronicle/wire/AbstractMarshallableCfg.java
@@ -49,7 +49,7 @@ public void readMarshallable(@NotNull WireIn wire) throws IORuntimeException, In
 
         // Use the WireMarshaller to read the configuration
         // Field that are not present in the input are not touched.
-        wm.readMarshallable(this, wire, wm.defaultValue(), false);
+        wm.readMarshallable(this, wire, false);
     }
 
     /**
@@ -69,7 +69,7 @@ public void writeMarshallable(@NotNull WireOut wire) throws InvalidMarshallableE
 
         // Use the WireMarshaller to write the configuration
         // Fields with a default value are not written
-        marshaller.writeMarshallable(this, wire, marshaller.defaultValue(), false);
+        marshaller.writeMarshallable(this, wire, false);
     }
 
     /**

diff --git a/src/main/java/net/openhft/chronicle/wire/Marshallable.java b/src/main/java/net/openhft/chronicle/wire/Marshallable.java
@@ -136,7 +136,7 @@ default void readMarshallable(@NotNull WireIn wire) throws IORuntimeException, I
         WireMarshaller<Object> wm = WIRE_MARSHALLER_CL.get(this.getClass());
 
         // Delegate the reading process to the obtained WireMarshaller
-        wm.readMarshallable(this, wire, wm.defaultValue(), true);
+        wm.readMarshallable(this, wire, true);
     }
 
     /**