[rfc] [icedtea-web] providing little bit more debug outputs for few methods

[Deepak Bhole]

* Jiri Vanek <jvanek at redhat.com> [2012-05-25 05:32]:
> On 05/24/2012 06:52 PM, Deepak Bhole wrote:
> >Cheers,
> >Deepak
> >
> HA!
> I got it >:) One condition really escaped. I fixed the block like in
> patch. It is much more readable now and much more bulletproof. Thanx
> for catch!
> With attached patch the jmol is working fine.
> 

Looks fine now. Thanks. OK for push.

cheers,
Deepak

> 2012-05-25  Jiri Vanek  <jvanek at redhat.com>
> 
> 	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getPermissions):
> 	New rethrow of exceptions and following condition make more accurate.

> diff -r 2c84a314c411 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu May 24 15:37:30 2012 -0400
> +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri May 25 11:13:42 2012 +0200
> @@ -914,22 +914,26 @@
>                  // 1. Code must be signed
>                  // 2. ALL or J2EE permissions must be requested (note: plugin requests ALL automatically)
>                  if (cs == null) {
> -                    throw new RuntimeException("Code source was null");
> +                    throw new NullPointerException("Code source was null");
>                  }
> -                if (cs.getLocation() == null) {
> -                    throw new RuntimeException("Code source location was null");
> -                }
> -                if (getCodeSourceSecurity(cs.getLocation()) == null) {
> -                    throw new RuntimeException("Code source security was null");
> -                }
> -                if (getCodeSourceSecurity(cs.getLocation()).getSecurityType() == null) {
> -                    throw new RuntimeException("Code source security type was null");
> -                }
> -                if (cs.getCodeSigners() != null
> -                        && (getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS)
> -                        || getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS))) {
> +                if (cs.getCodeSigners() != null) {
> +                    if (cs.getLocation() == null) {
> +                        throw new NullPointerException("Code source location was null");
> +                    }
> +                    if (getCodeSourceSecurity(cs.getLocation()) == null) {
> +                        throw new NullPointerException("Code source security was null");
> +                    }
> +                    if (getCodeSourceSecurity(cs.getLocation()).getSecurityType() == null) {
> +                        if (JNLPRuntime.isDebug()){
> +                        new NullPointerException("Warning! Code source security type was null").printStackTrace();
> +                        }
> +                    }
> +                    Object securityType = getCodeSourceSecurity(cs.getLocation()).getSecurityType();
> +                    if (SecurityDesc.ALL_PERMISSIONS.equals(securityType)
> +                            || SecurityDesc.J2EE_PERMISSIONS.equals(securityType)) {
>  
> -                    permissions = getCodeSourceSecurity(cs.getLocation()).getPermissions(cs);
> +                        permissions = getCodeSourceSecurity(cs.getLocation()).getPermissions(cs);
> +                    }
>                  }
>  
>                  Enumeration<Permission> e = permissions.elements();