[rfc][icedtea-web] More shutdown fixes -- Interrupt applet threads after shutdown, fix NPE

[Omair Majid]

On 02/13/2013 03:44 PM, Adam Domurad wrote:
> I had previously posted a patch for an NPE that only occurred during
> shutdown, but I had not looked into it too deeply.
> 
> Now I see the cause is:
> 
> sun.applet.AppletPanel.java:
> 
>     private AccessControlContext getAccessControlContext(final URL
> codebase) {
> 
>         PermissionCollection perms = (PermissionCollection)
>             AccessController.doPrivileged(new PrivilegedAction() {
>                     public Object run() {
>                         Policy p = java.security.Policy.getPolicy();
>                         if (p != null) {
>>>>                         return p.getPermissions(new
> CodeSource(null,         <<<
> (java.security.cert.Certificate[]) null));
>                         } else {
>                             return null;
>                         }
>                     }
>                 });
> 
> This occurs in PluginAppletViewer#appletShutdown, when
> p.sendEvent(AppletPanel.APPLET_QUIT); is used. A null source location
> must thus be supported as such:
> 
> diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> @@ -1144,7 +1144,7 @@ public class JNLPClassLoader extends URL
>              }
> 
>              // Class from host X should be allowed to connect to host X
> -            if (cs.getLocation().getHost().length() > 0)
> +            if (cs.getLocation() != null &&
> cs.getLocation().getHost().length() > 0)
>                  result.add(new
> SocketPermission(cs.getLocation().getHost(),
>                          "connect, accept"));


This fix for the NPE looks fine to me.

Cheers,
Omair


-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681