diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-19 09:45:44 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-19 09:45:44 +0000 |
| commit | cb4ebfec53283bb8ab6cfaba9dd0d74898e2b222 (patch) | |
| tree | 0a392b750dd3b1ce90c6ad694e2a2d3fd2a87d46 /libjava | |
| parent | 7ecf962fd899ad6e96114c4acd8e3210c21e92f0 (diff) | |
| download | gcc-cb4ebfec53283bb8ab6cfaba9dd0d74898e2b222.tar.gz | |
2003-06-19 Michael Koch <konqueror@gmx.de>
* gnu/java/security/x509/X509Certificate.java
(writeReplace): Merged from classpath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68187 138bc75d-0d04-0410-961f-82ee72b054a4
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 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(); } |