[icedtea-web] RFC: Patch to fix PR794 (Class-Path element processing)

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2011-09-28 15:18]:
> On 09/28/2011 02:57 PM, Deepak Bhole wrote:
> >* Omair Majid<omajid at redhat.com>  [2011-09-27 21:07]:
> 
> Looks good to me!
> 

Thanks! Committed to 1.1 and HEAD.

Attached is a partial patch for application to 1.0.

It only blanks the manifest so that Elluminate will work again. The
plug-in in 1.0.x never supported classpaths in manifest anyway, so this
should have no effect there.

ChangeLog:
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.

Okay for 1.0?

Deepak
-------------- next part --------------
diff -r 09c15e374a75 NEWS
--- a/NEWS	Fri Aug 05 11:52:15 2011 -0400
+++ b/NEWS	Wed Sep 28 15:43:49 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 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 15:43:49 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;