changeset in /hg/icedtea6: 2009-05-13 Lillian Angel <langel at re...

[Lillian Angel]

changeset f3427fa48e53 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f3427fa48e53
description:
	2009-05-13  Lillian Angel  <langel at redhat.com>

	        * plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
	        (PluginAppletSecurityContext): Added comment.
	        * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
	        (checkPermission): Fixed style.

diffstat:

3 files changed, 13 insertions(+), 6 deletions(-)
ChangeLog                                                  |    7 +++++++
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java |    2 +-
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java   |   10 +++++-----

diffs (46 lines):

diff -r fd22df4a6701 -r f3427fa48e53 ChangeLog
--- 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-11  Lillian Angel  <langel at redha
+2009-05-13  Lillian Angel  <langel at 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 at redhat.com>
 
 	* rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java
diff -r fd22df4a6701 -r f3427fa48e53 plugin/icedtea/sun/applet/PluginAppletSecurityContext.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 @@ public class PluginAppletSecurityContext
 		// 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();
diff -r fd22df4a6701 -r f3427fa48e53 rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
--- 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 @@ class JNLPSecurityManager extends Securi
 
         // Enable this manually -- it'll produce too much output for -verbose
         // otherwise.
-//		if (true)
-//			System.out.println("Checking permission: " + perm.toString());
-
-        if (!JNLPRuntime.isWebstartApplication() && ("setPolicy".equals(name) ||
-            "setSecurityManager".equals(name)))
+	//	if (true)
+	//  	  System.out.println("Checking permission: " + perm.toString());
+
+        if (!JNLPRuntime.isWebstartApplication() && 
+	      ("setPolicy".equals(name) || "setSecurityManager".equals(name)))
             throw new SecurityException(R("RCantReplaceSM"));
 
         try {