[RFC][netx] - PR664

[Deepak Bhole]

* Denis Lila <dlila at redhat.com> [2011-03-23 16:09]:
> The attached patch fixes 664.
> 
> I think the changes are pretty self explanatory.
> 
> Any comments are welcome.
> 
> Thank you,
> Denis.


Changes look good to me. The ChangeLog indentation is incorrect though.
Also, PR664 should be listed under plugin, not webstart.

After fixing the above, okay for HEAD.

Cheers,
Deepak

> diff -r a640b4e4d226 ChangeLog
> --- a/ChangeLog	Mon Mar 21 17:27:20 2011 +0100
> +++ b/ChangeLog	Wed Mar 23 16:08:56 2011 -0400
> @@ -1,3 +1,10 @@
> +2011-03-21  Denis Lila  <dlila at redhat.com>
> +
> +	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> +	(findResource, findResources):
> +		New functions. Return nothing if name.startsWith("META-INF").
> +		Otherwise delegate to superclass.
> +
>  2011-03-21  Matthias Klose  <doko at ubuntu.com>
>  
>  	* launcher/itweb-settings.in: Use /bin/sh as interpreter.
> diff -r a640b4e4d226 NEWS
> --- a/NEWS	Mon Mar 21 17:27:20 2011 +0100
> +++ b/NEWS	Wed Mar 23 16:08:56 2011 -0400
> @@ -24,6 +24,7 @@
>    - Use Firefox's proxy settings if possible
>    - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
>    - PR658: now jnlp.packEnabled works with applets.
> +  - PR664: Sound doesn't play on runescape.com.
>  * Plugin
>    - PR475, RH604061: Allow applets from the same page to use the same classloader
>    - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read)
> diff -r a640b4e4d226 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Mar 21 17:27:20 2011 +0100
> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Mar 23 16:08:56 2011 -0400
> @@ -1367,5 +1367,21 @@
>          public JNLPClassLoader getParentJNLPClassLoader() {
>              return parentJNLPClassLoader;
>          }
> +
> +        @Override
> +        public Enumeration<URL> findResources(String name) throws IOException {
> +            if (!name.startsWith("META-INF")) {
> +                return super.findResources(name);
> +            }
> +            return (new Vector<URL>(0)).elements();
> +        }
> +
> +        @Override
> +        public URL findResource(String name) {
> +            if (!name.startsWith("META-INF")) {
> +                return super.findResource(name);
> +            }
> +            return null;
> +        }
>      }
>  }