diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/security/x509/X509Certificate.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e2a6eca6315..02927c243ce 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2003-06-19 Michael Koch <konqueror@gmx.de> + * gnu/java/security/x509/X509Certificate.java + (writeReplace): Merged from classpath. + +2003-06-19 Michael Koch <konqueror@gmx.de> + * gnu/java/nio/FileChannelImpl.java (map_address): Made public. (FileChannelImpl): Merged with classpath. diff --git a/libjava/gnu/java/security/x509/X509Certificate.java b/libjava/gnu/java/security/x509/X509Certificate.java index ca4854ccff1..1ec2e87c2c6 100644 --- a/libjava/gnu/java/security/x509/X509Certificate.java +++ b/libjava/gnu/java/security/x509/X509Certificate.java @@ -424,7 +424,7 @@ public class X509Certificate extends java.security.cert.X509Certificate return subjectKey; } - public Object writeReplace() throws ObjectStreamException + protected Object writeReplace() throws ObjectStreamException { return super.writeReplace(); } |