/hg/icedtea-web: Avoid potential NPE in JNLPSecurityManager#addP...

[aazores at icedtea.classpath.org]

changeset b3a5748145ca in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b3a5748145ca
author: Andrew Azores <aazores at redhat.com>
date: Tue Nov 05 13:26:59 2013 -0500

	Avoid potential NPE in JNLPSecurityManager#addPermission when debug is enabled

	* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
	(addPermission) avoid NPE in JNLPClassLoader#getPermissions with debug
	enabled


diffstat:

 ChangeLog                                                  |   6 ++++++
 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java |  10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 6a7915fdff8c -r b3a5748145ca ChangeLog
--- a/ChangeLog	Fri Nov 01 13:23:25 2013 +0100
+++ b/ChangeLog	Tue Nov 05 13:26:59 2013 -0500
@@ -1,3 +1,9 @@
+2013-11-05  Andrew Azores  <aazores at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java:
+	(addPermission) avoid NPE in JNLPClassLoader#getPermissions with debug
+	enabled
+
 2013-11-01  Jiri Vanek  <jvanek at redhat.com>
 
 	Synced headers between PLUGIN_DEBUG, PLUGIN_ERROR and javaside
diff -r 6a7915fdff8c -r b3a5748145ca netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Fri Nov 01 13:23:25 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Tue Nov 05 13:26:59 2013 -0500
@@ -317,10 +317,14 @@
             JNLPClassLoader cl = (JNLPClassLoader) JNLPRuntime.getApplication().getClassLoader();
             cl.addPermission(perm);
             if (JNLPRuntime.isDebug()) {
-                if (cl.getPermissions(null).implies(perm)){
-                    OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Added permission: " + perm.toString());
+                if (cl.getSecurity() == null) {
+                    if (cl.getPermissions(null).implies(perm)){
+                        OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Added permission: " + perm.toString());
+                    } else {
+                        OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Unable to add permission: " + perm.toString());
+                    }
                 } else {
-                    OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Unable to add permission: " + perm.toString());
+                    OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Cannot get permissions for null codesource when classloader security is not null");
                 }
             }
         } else {