jdk-sandbox: comparison jdk/src/share/classes/java/time/chrono/HijrahDate.java

equal deleted inserted replaced

-:4e10a58fa28f
+:15c8e97d6a14
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.io.Serializable;
 import java.time.Clock;
 import java.time.DateTimeException;
 */
 private static final long serialVersionUID = -5207853542612002020L;
 /**
 * The Chronology of this HijrahDate.
 */
-private final HijrahChronology chrono;
+private final transient HijrahChronology chrono;
 /**
 * The proleptic year.
 */
 private final transient int prolepticYear;
 /**
 int months = (int) (totalMonths % 12);  // safe
 return Period.of(Math.toIntExact(years), months, days);
 }
 //-----------------------------------------------------------------------
+/**
+* Defend against malicious streams.
+* @return never
+* @throws InvalidObjectException always
+*/
+private Object readResolve() throws InvalidObjectException {
+throw new InvalidObjectException("Deserialization via serialization delegate");
+}
+/**
+* Writes the object using a
+* <a href="../../../serialized-form.html#java.time.chrono.Ser">dedicated serialized form</a>.
+* @serialData
+* <pre>
+*  out.writeByte(6);                 // identifies a HijrahDate
+*  out.writeObject(chrono);          // the HijrahChronology variant
+*  out.writeInt(get(YEAR));
+*  out.writeByte(get(MONTH_OF_YEAR));
+*  out.writeByte(get(DAY_OF_MONTH));
+* </pre>
+*
+* @return the instance of {@code Ser}, not null
+*/
 private Object writeReplace() {
 return new Ser(Ser.HIJRAH_DATE_TYPE, this);
 }
 void writeExternal(ObjectOutput out) throws IOException {
 // HijrahChronology is implicit in the Hijrah_DATE_TYPE
-out.writeObject(chrono);
+out.writeObject(getChronology());
 out.writeInt(get(YEAR));
 out.writeByte(get(MONTH_OF_YEAR));
 out.writeByte(get(DAY_OF_MONTH));
-}
-/**
-* Replaces the date instance from the stream with a valid one.
-* ReadExternal has already read the fields and created a new instance
-* from the data.
-*
-* @return the resolved date, never null
-*/
-private Object readResolve() {
-return this;
 }
 static HijrahDate readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
 HijrahChronology chrono = (HijrahChronology) in.readObject();
 int year = in.readInt();

changeset 19841	15c8e97d6a14
parent 19030	32f129cb6351
child 20518	dde564773845