Mercurial > hg > release > icedtea6-1.5

changeset 1521:f3427fa48e53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-05-13 Lillian Angel <langel@redhat.com> * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java (PluginAppletSecurityContext): Added comment. * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java (checkPermission): Fixed style.
author Lillian Angel <langel@redhat.com>
date Wed, 13 May 2009 10:11:28 -0400
parents fd22df4a6701
children 370d4ef5ff5c
files ChangeLog plugin/icedtea/sun/applet/PluginAppletSecurityContext.java rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 12 13:04:57 2009 -0400
+++ b/ChangeLog	Wed May 13 10:11:28 2009 -0400
@@ -1,3 +1,10 @@
+2009-05-13  Lillian Angel  <langel@redhat.com>
+
+	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
+	(PluginAppletSecurityContext): Added comment.	
+	* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
+	(checkPermission): Fixed style.
+
 2009-05-11  Lillian Angel  <langel@redhat.com>
 
 	* rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Tue May 12 13:04:57 2009 -0400
+++ b/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Wed May 13 10:11:28 2009 -0400
@@ -248,7 +248,7 @@
 		// an applet will be loaded at some point, we should make it the SM 
 		// that JNLPRuntime will try to install
 		if (System.getSecurityManager() == null) {
-			JNLPRuntime.initialize(false);
+			JNLPRuntime.initialize(/* isApplication */ false);
 		}
 
 		JNLPRuntime.disableExit();
--- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Tue May 12 13:04:57 2009 -0400
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Wed May 13 10:11:28 2009 -0400
@@ -258,11 +258,11 @@
 
         // Enable this manually -- it'll produce too much output for -verbose
         // otherwise.
-//		if (true)
-//			System.out.println("Checking permission: " + perm.toString());
+	//	if (true)
+	//  	  System.out.println("Checking permission: " + perm.toString());
 
-        if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) ||
-            "setSecurityManager".equals(name)))
+        if (!JNLPRuntime.isWebstartApplication() && 
+	      ("setPolicy".equals(name) || "setSecurityManager".equals(name)))
             throw new SecurityException(R("RCantReplaceSM"));
 
         try {