[REVIEW FOR 1.8] Fix regression in PR764 caused by previous security update

[Dr Andrew John Hughes]

I'd like to apply the attached simple patch to 1.8 to fix the regression
mentioned in http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=764.
The previous security update for NetX introduced unnecessary @Override
annotations which broke the build on older versions of ecj.

Ok for 1.8?

2011-10-17  Andrew John Hughes  <ahughes at 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.
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
diff -r a31e65674d37 NEWS
--- a/NEWS	Thu Sep 29 16:40:51 2011 -0400
+++ b/NEWS	Mon Oct 17 14:06:51 2011 +0100
@@ -12,6 +12,7 @@
 
 * 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):
 
diff -r a31e65674d37 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java	Thu Sep 29 16:40:51 2011 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java	Mon Oct 17 14:06:51 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;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111017/97d7986f/attachment.bin