Mercurial > hg > release > icedtea-web-1.2

changeset 308:f36e0b3fb9f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Deepak Bhole <dbhole@redhat.com>
date Tue, 08 Nov 2011 11:06:52 -0500
parents 614de01ec4e4 (current diff) 89b7a28ccafb (diff)
children 5860a2cbe221
files ChangeLog NEWS
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Oct 28 14:29:21 2011 -0400
+++ b/ChangeLog	Tue Nov 08 11:06:52 2011 -0500
@@ -1,3 +1,11 @@
+2011-10-31  Omair Majid  <omajid@redhat.com>
+
+	PR808: javaws is unable to start when missing jars are enumerated before
+	main jar
+	* NEWS: Update.
+	* netx/net/sourceforge/jnlp/tools/JarSigner.java (verifyJars): Continue
+	with other jars if the first jar can't be used.
+
 2011-10-28  Deepak Bhole <dbhole@redhat.com>
 
 	RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and
--- a/NEWS	Fri Oct 28 14:29:21 2011 -0400
+++ b/NEWS	Tue Nov 08 11:06:52 2011 -0500
@@ -30,6 +30,7 @@
   - PR778: Jar download and server certificate verification deadlock
   - PR789: typo in jrunscript.sh
   - PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path element in the manifest
+  - PR808: javaws is unable to start, when missing jars are enumerated before main jar
   - RH734081: Javaws cannot use proxy settings from Firefox
   - RH738814: Access denied at ssl handshake
   - Support for authenticating using client certificates
--- a/netx/net/sourceforge/jnlp/tools/JarSigner.java	Fri Oct 28 14:29:21 2011 -0400
+++ b/netx/net/sourceforge/jnlp/tools/JarSigner.java	Tue Nov 08 11:06:52 2011 -0500
@@ -194,7 +194,7 @@
                 // some sort of resource download/cache error. Nothing to add
                 // in that case ... but don't fail here
                 if (jarFile == null) {
-                    return;
+                    continue;
                 }
 
                 String localFile = jarFile.getAbsolutePath();