diff options
| author | Andreas Tobler <andreast@gcc.gnu.org> | 2004-09-21 13:25:26 +0200 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2004-09-21 13:25:26 +0200 |
| commit | 936f1f064115f94425c521a5c94f0957f67a480d (patch) | |
| tree | cd703e0acbe11a854bb1b4125a1f870691690670 /libjava | |
| parent | 77747e5f2d1fc0bc4dc4aaf137da9dc158697c81 (diff) | |
| download | gcc-936f1f064115f94425c521a5c94f0957f67a480d.zip gcc-936f1f064115f94425c521a5c94f0957f67a480d.tar.gz gcc-936f1f064115f94425c521a5c94f0957f67a480d.tar.bz2 | |
[multiple changes]
2004-09-21 Andreas Tobler <a.tobler@schweiz.ch>
* javax/security/auth/x500/X500Principal.java: Fix some merge glitches.
2004-09-21 Michael Koch <konqueror@gmx.de>
* javax/net/ssl/SSLServerSocket.java:
Removed comment about "Do not edit this file, it's generated.".
From-SVN: r87800
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/javax/net/ssl/SSLServerSocket.java | 1 | ||||
| -rw-r--r-- | libjava/javax/security/auth/x500/X500Principal.java | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b0fcc86..e32ff8c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,14 @@ 2004-09-21 Andreas Tobler <a.tobler@schweiz.ch> + * javax/security/auth/x500/X500Principal.java: Fix some merge glitches. + +2004-09-21 Michael Koch <konqueror@gmx.de> + + * javax/net/ssl/SSLServerSocket.java: + Removed comment about "Do not edit this file, it's generated.". + +2004-09-21 Andreas Tobler <a.tobler@schweiz.ch> + Import the big Crypto/Jessie/Security merge from Classpath. * Makefile.am: Add imported files. diff --git a/libjava/javax/net/ssl/SSLServerSocket.java b/libjava/javax/net/ssl/SSLServerSocket.java index eab92a2..fee99f4 100644 --- a/libjava/javax/net/ssl/SSLServerSocket.java +++ b/libjava/javax/net/ssl/SSLServerSocket.java @@ -1,4 +1,3 @@ -// THIS IS A GENERATED FILE. DO NOT EDIT. -*- buffer-read-only: t -*- /* SSLServerSocket.java -- a server socket for SSL connections. Copyright (C) 2004 Free Software Foundation, Inc. diff --git a/libjava/javax/security/auth/x500/X500Principal.java b/libjava/javax/security/auth/x500/X500Principal.java index 95f80fc..201a195 100644 --- a/libjava/javax/security/auth/x500/X500Principal.java +++ b/libjava/javax/security/auth/x500/X500Principal.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -121,7 +121,7 @@ public final class X500Principal implements Principal, Serializable iae.initCause (ioe); throw iae; } - } + } public X500Principal (byte[] encoded) { |