diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-06-19 09:45:44 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-06-19 09:45:44 +0000 |
| commit | d5b73c26aceab86ff3eaf810eb77965771886fd4 (patch) | |
| tree | 0a392b750dd3b1ce90c6ad694e2a2d3fd2a87d46 /libjava | |
| parent | b7a793afb7b72ed72f4c083b376abba287d63a76 (diff) | |
| download | gcc-d5b73c26aceab86ff3eaf810eb77965771886fd4.zip gcc-d5b73c26aceab86ff3eaf810eb77965771886fd4.tar.gz gcc-d5b73c26aceab86ff3eaf810eb77965771886fd4.tar.bz2 | |
2003-06-19 Michael Koch <konqueror@gmx.de>
* gnu/java/security/x509/X509Certificate.java
(writeReplace): Merged from classpath.
From-SVN: r68187
Diffstat (limited to 'libjava')
| -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 e2a6eca..02927c2 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 ca4854c..1ec2e87 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(); } |