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

[Jiri Vanek]

On 05/24/2012 06:52 PM, Deepak Bhole wrote:
> * Jiri Vanek<jvanek at redhat.com>  [2012-05-24 05:15]:
>>>
>>> Can you please either back this out or change it to not make it throw
>>> exceptions (just printing it instead)? This patch breaks
>>> http://jmol.sourceforge.net/demo/atoms/
>>>
>>> Thanks for Danesh for tracing this!
>>>
>>> Thanks,
>>> Deepak
>>
>> Hmmm.. I have look inside this, and I do not feel guilty. Actually
>> it looks like another occurrence of RH816592. The fact that we see
>> why it is failing does not mean that it caused the app to fail.
>> AFAIK my debbuging outputs have not changed the behaviour at all.
>> Adding sout printing before returning null and rethrowing "exception
>> which would be thrown anyway". So the just printing WILL change
>> older behaviour.
>> Although I addmit that I have one small mistake - fixed in attached patch. However this did not help.
>>
>> The original pathc for RH816592 is solving this issue, but 1.2 is
>> working as well! So I think this reproducer had to be broken much
>> longer ago!
>>
>> I'm going to attach enhanced patch for RH816592 later today.
>>
>>
>
> I am not sure I understand. It worked before, it doesn't now. How can it be
> an occurrence of another bug when it was never a bug before to begin
> with?
>
> 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.

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.
-------------- next part --------------
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();