RFC: Backport PR542 to icedtea6 1.9 and 1.8
Deepak Bhole
dbhole at redhat.com
Thu Mar 24 13:46:09 PDT 2011
* Omair Majid <omajid at redhat.com> [2011-03-24 16:38]:
> Hi,
>
<snip>
> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 24 15:35:34 2011 -0400
> @@ -424,7 +424,14 @@
>
> for (JARDesc jarDesc: file.getResources().getJARs()) {
> try {
> - URL location = tracker.getCacheFile(jarDesc.getLocation()).toURI().toURL();
> + File cachedFile = tracker.getCacheFile(jarDesc.getLocation());
> +
> + if (cachedFile == null) {
> + System.err.println("JAR " + jarDesc.getLocation() + " not found. Continuing.");
> + continue; // JAR not found. Keep going.
> + }
> + URL location = cachedFile.toURL();
> +
> SecurityDesc jarSecurity = file.getSecurity();
>
> if (file instanceof PluginBridge) {
Indentation is messed up in the above block.
> diff -r 77b802f946bb ChangeLog
> --- a/ChangeLog Mon Mar 07 17:22:45 2011 +0100
> +++ b/ChangeLog Thu Mar 24 15:27:15 2011 -0400
> @@ -1,3 +1,12 @@
> +2010-11-01 Deepak Bhole <dbhole at redhat.com>
> +
> + R542: Plugin fails with NPE on
Typo above, should say PR542.
After fixing above, I am okay with commit.
Cheers,
Deepak
More information about the distro-pkg-dev
mailing list