diff -r 18a23ba7dd38 -r 86eb26ff8f2b jdk/src/share/classes/java/time/ZoneRegion.java --- a/jdk/src/share/classes/java/time/ZoneRegion.java Fri Dec 20 08:59:52 2013 -0800 +++ b/jdk/src/share/classes/java/time/ZoneRegion.java Fri Dec 20 13:06:23 2013 -0500 @@ -60,7 +60,7 @@ import java.io.DataOutput; import java.io.IOException; import java.io.InvalidObjectException; -import java.io.InvalidObjectException; +import java.io.ObjectInputStream; import java.io.Serializable; import java.time.zone.ZoneRules; import java.time.zone.ZoneRulesException; @@ -195,10 +195,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"); }