/hg/release/icedtea-web-1.0: PR794: IcedTea-Web does not work if...

[dbhole at icedtea.classpath.org]

changeset c93e44ff65f8 in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=c93e44ff65f8
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Sep 28 16:06:02 2011 -0400

	PR794: IcedTea-Web does not work if a Web Start app jar has a Class-
	Path element in the manifest.


diffstat:

 ChangeLog                                                    |   7 ++++
 NEWS                                                         |   3 +-
 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java |  19 +++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r 09c15e374a75 -r c93e44ff65f8 ChangeLog
--- a/ChangeLog	Fri Aug 05 11:52:15 2011 -0400
+++ b/ChangeLog	Wed Sep 28 16:06:02 2011 -0400
@@ -1,3 +1,10 @@
+2011-09-28  Deepak Bhole <dbhole at redhat.com>
+
+	PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path
+	element in the manifest.
+	* netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
+	(retrieve): Blank out the Class-Path elements in manifest.
+
 2011-08-05  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
diff -r 09c15e374a75 -r c93e44ff65f8 NEWS
--- a/NEWS	Fri Aug 05 11:52:15 2011 -0400
+++ b/NEWS	Wed Sep 28 16:06:02 2011 -0400
@@ -11,8 +11,9 @@
 New in release 1.0.5 (2011-XX-XX):
 * Plugin
   - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
-Common
+* Common
   - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
+  - PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path element in the manifest
 
 New in release 1.0.4 (2011-07-20):
 * Security updates:
diff -r 09c15e374a75 -r c93e44ff65f8 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- a/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java	Fri Aug 05 11:52:15 2011 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java	Wed Sep 28 16:06:02 2011 -0400
@@ -94,7 +94,24 @@
 
         if (UrlUtils.isLocalFile(localUrl)) {
             // if it is known to us, just return the cached file
-            return new JarFile(localUrl.getPath());
+            JarFile returnFile = new JarFile(localUrl.getPath());
+            
+            try {
+                
+                // Blank out the class-path because Web Start does not support 
+                // it and the plug-in does not support manifest classpaths in 
+                // icedtea-web 1.0.x
+                returnFile.getManifest().getMainAttributes().putValue("Class-Path", "");
+
+                if (JNLPRuntime.isDebug()) {
+                    System.err.println("Class-Path attribute cleared for " + returnFile.getName());
+                }
+
+            } catch (NullPointerException npe) {
+                // Discard NPE here. Maybe there was no manifest, maybe there were no attributes, etc.
+            }
+
+            return returnFile;
         } else {
             // throw new IllegalStateException("a non-local file in cache");
             return null;