diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-07 14:14:14 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-07 14:14:14 +0000 |
| commit | 89b7e585a0c271df33e5dc90699ccbac9f0ba023 (patch) | |
| tree | a0e8041987e27207442a829d6043b63c48192368 /libjava | |
| parent | 0bf7f84736d44a77940785b2014ea9d8edaba578 (diff) | |
| download | gcc-89b7e585a0c271df33e5dc90699ccbac9f0ba023.tar.gz | |
2006-08-07 Gary Benson <gbenson@redhat.com>
* java/security/VMAccessController.java (pushContext, popContext,
getContext): Use Thread.currentThread() to determine when we're
bootstrapping.
(runtimeInitialized): Remove.
* java/security/natVMAccessController.cc (runtimeInitialized):
Remove.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115996 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/java/security/VMAccessController.java | 13 | ||||
| -rw-r--r-- | libjava/java/security/natVMAccessController.cc | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 57044e81a89..5b8d467f6a5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2006-08-07 Gary Benson <gbenson@redhat.com> + + * java/security/VMAccessController.java (pushContext, popContext, + getContext): Use Thread.currentThread() to determine when we're + bootstrapping. + (runtimeInitialized): Remove. + * java/security/natVMAccessController.cc (runtimeInitialized): + Remove. + 2006-08-06 Tom Tromey <tromey@redhat.com> PR libgcj/28491: diff --git a/libjava/java/security/VMAccessController.java b/libjava/java/security/VMAccessController.java index dfbd16f693b..c39475334bb 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(); } diff --git a/libjava/java/security/natVMAccessController.cc b/libjava/java/security/natVMAccessController.cc index 25503453284..e56ccbd9135 100644 --- a/libjava/java/security/natVMAccessController.cc +++ b/libjava/java/security/natVMAccessController.cc @@ -22,9 +22,3 @@ java::security::VMAccessController::getStack () _Jv_StackTrace *trace = _Jv_StackTrace::GetStackTrace (); return _Jv_StackTrace::GetClassMethodStack (trace); } - -jboolean -java::security::VMAccessController::runtimeInitialized () -{ - return gcj::runtimeInitialized; -} |