Mercurial > hg > release > icedtea6-1.8
changeset 2162:d29047ebebcb
PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java
2011-10-17 Andrew John Hughes <ahughes@redhat.com>
PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java
* netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java:
(retrieve(URL)): Remove @Override annotations.
(run()): Likewise.
* NEWS: Updated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 18 Oct 2011 13:54:08 +0100 |
| parents | 7524f507af5c |
| children | 878baf89f19a |
| files | ChangeLog NEWS netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 17 15:40:23 2011 +0100 +++ b/ChangeLog Tue Oct 18 13:54:08 2011 +0100 @@ -1,3 +1,11 @@ +2011-10-17 Andrew John Hughes <ahughes@redhat.com> + + PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java + * netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java: + (retrieve(URL)): Remove @Override annotations. + (run()): Likewise. + * NEWS: Updated. + 2011-10-17 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add patches.
--- a/NEWS Mon Oct 17 15:40:23 2011 +0100 +++ b/NEWS Tue Oct 18 13:54:08 2011 +0100 @@ -25,6 +25,7 @@ - S7096936, CVE-2011-3560: missing checkSetFactory calls in HttpsURLConnection * NetX - PR794: javaws does not work if a Web Start app jar has a Class-Path element in the manifest + - PR764: icedtea 1.8.9 fails to build in CachedJarFileCallback.java New in release 1.8.9 (2011-07-20):
--- a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Mon Oct 17 15:40:23 2011 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Tue Oct 18 13:54:08 2011 +0100 @@ -80,7 +80,6 @@ mapping.put(remoteUrl, localUrl); } - @Override public JarFile retrieve(URL url) throws IOException { URL localUrl = mapping.get(url); @@ -133,7 +132,6 @@ try { result = AccessController.doPrivileged(new PrivilegedExceptionAction<JarFile>() { - @Override public JarFile run() throws IOException { OutputStream out = null; File tmpFile = null;