--- a/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java Fri Dec 20 08:59:52 2013 -0800
+++ b/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java Fri Dec 20 13:06:23 2013 -0500
@@ -66,6 +66,7 @@
import static java.time.temporal.ChronoUnit.MONTHS;
import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
import java.io.Serializable;
import java.time.Clock;
import java.time.DateTimeException;
@@ -523,10 +524,10 @@
/**
* Defend against malicious streams.
- * @return never
+ *
* @throws InvalidObjectException always
*/
- private Object readResolve() throws InvalidObjectException {
+ private void readObject(ObjectInputStream s) throws InvalidObjectException {
throw new InvalidObjectException("Deserialization via serialization delegate");
}
}