FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Runtime.java, [...]: Replaced java.lang.Runtime.securityManager by java.lang.SecurityManager.current...

Browse source 
2005-04-25  Michael Koch  <konqueror@gmx.de>

	* java/lang/Runtime.java,
	java/lang/SecurityManager.java,
	java/lang/System.java,
	java/lang/ThreadGroup.java:
	Replaced java.lang.Runtime.securityManager by
	java.lang.SecurityManager.current (as used in GNU classpath).

From-SVN: r98738
This commit is contained in:
Michael Koch 2005-04-25 20:35:17 +00:00 • committed by Michael Koch
parent 1f4ea3f2fa
commit 4b30c6bda0
5 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libjava/java/lang/Runtime.java
View file

@ -65,14 +65,6 @@ public class Runtime
*/
private final String[] libpath;
/**
* The current security manager. This is located here instead of in
* System, to avoid security problems, as well as bootstrap issues.
* Make sure to access it in a thread-safe manner; it is package visible
* to avoid overhead in java.lang.
*/
static SecurityManager securityManager;
static
{
init();
@ -151,7 +143,7 @@ public class Runtime
*/
public void exit(int status)
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkExit(status);
boolean first = false;
@ -279,7 +271,7 @@ public class Runtime
*/
public void addShutdownHook(Thread hook)
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkPermission(new RuntimePermission("shutdownHooks"));
if (hook.isAlive() || hook.getThreadGroup() == null)
@ -313,7 +305,7 @@ public class Runtime
*/
public boolean removeShutdownHook(Thread hook)
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkPermission(new RuntimePermission("shutdownHooks"));
synchronized (libpath)
@ -340,7 +332,7 @@ public class Runtime
*/
public void halt(int status)
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkExit(status);
exitInternal(status);
@ -364,7 +356,7 @@ public class Runtime
*/
public static void runFinalizersOnExit(boolean finalizeOnExit)
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkExit(0);
current.finalizeOnExit = finalizeOnExit;
@ -494,7 +486,7 @@ public class Runtime
public Process exec(String[] cmd, String[] env, File dir)
throws IOException
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkExec(cmd[0]);
return execInternal(cmd, env, dir);
@ -581,7 +573,7 @@ public class Runtime
*/
public void load(String filename)
{
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkLink(filename);
_load(filename, false);
@ -611,7 +603,7 @@ public class Runtime
{
// This is different from the Classpath implementation, but I
// believe it is more correct.
SecurityManager sm = securityManager; // Be thread-safe!
SecurityManager sm = SecurityManager.current; // Be thread-safe!
if (sm != null)
sm.checkLink(libname);
_load(libname, true);