Mercurial > hg > release > icedtea6-1.12
changeset 2042:c20d20b055cc
Remove @Override on HttpsClient interface method to allow 1.5 compilation.
2010-03-28 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-override.patch:
Remove @Override on interface method
in sun/net/www/protocol/https/HttpsClient.java
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 29 Mar 2010 00:25:26 +0100 |
| parents | 254982e12a63 |
| children | e3cdadcefb93 |
| files | ChangeLog patches/icedtea-override.patch |
| diffstat | 2 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 12 02:56:31 2010 +0000 +++ b/ChangeLog Mon Mar 29 00:25:26 2010 +0100 @@ -1,3 +1,9 @@ +2010-03-28 Andrew John Hughes <ahughes@redhat.com> + + * patches/icedtea-override.patch: + Remove @Override on interface method + in sun/net/www/protocol/https/HttpsClient.java + 2010-03-12 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-fonts.patch:
--- a/patches/icedtea-override.patch Fri Mar 12 02:56:31 2010 +0000 +++ b/patches/icedtea-override.patch Mon Mar 29 00:25:26 2010 +0100 @@ -196,3 +196,14 @@ return revocationReason; } +diff -r 697e3f8cac33 src/share/classes/sun/net/www/protocol/https/HttpsClient.java +--- openjdk.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Wed Mar 24 17:05:49 2010 +0000 ++++ openjdk/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Sun Mar 28 12:55:34 2010 +0100 +@@ -624,7 +624,6 @@ + * a given connection may change. When sessions change, so may + * peer identities and cipher suites. + */ +- @Override + public void handshakeCompleted(HandshakeCompletedEvent event) + { + session = event.getSession();