From e79e0270c06080eaff1f06afd485beee53626090 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Mon, 7 Aug 2006 14:14:14 +0000 Subject: VMAccessController.java (pushContext, [...]): Use Thread.currentThread() to determine when we're bootstrapping. 2006-08-07 Gary Benson * java/security/VMAccessController.java (pushContext, popContext, getContext): Use Thread.currentThread() to determine when we're bootstrapping. (runtimeInitialized): Remove. * java/security/natVMAccessController.cc (runtimeInitialized): Remove. From-SVN: r115996 --- libjava/java/security/VMAccessController.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'libjava/java/security/VMAccessController.java') diff --git a/libjava/java/security/VMAccessController.java b/libjava/java/security/VMAccessController.java index dfbd16f..c394753 100644 --- a/libjava/java/security/VMAccessController.java +++ b/libjava/java/security/VMAccessController.java @@ -103,7 +103,7 @@ final class VMAccessController */ static void pushContext (AccessControlContext acc) { - if (!runtimeInitialized()) + if (Thread.currentThread() == null) return; if (DEBUG) @@ -127,7 +127,7 @@ final class VMAccessController */ static void popContext() { - if (!runtimeInitialized()) + if (Thread.currentThread() == null) return; if (DEBUG) @@ -161,7 +161,7 @@ final class VMAccessController // so that any security checks succeed. // // XXX this might not be necessary, but it seems prudent. - if (!runtimeInitialized()) + if (Thread.currentThread() == null) return DEFAULT_CONTEXT; // If we are already in getContext, but called a method that needs @@ -284,11 +284,4 @@ final class VMAccessController * of Strings comprising the method names. */ private static native Object[][] getStack(); - - /** - * Tell whether runtime initialization is complete. - * - * @return whether runtime initialization is complete. - */ - private static native boolean runtimeInitialized(); } -- cgit v1.1