diff options
| author | Gary Benson <gbenson@redhat.com> | 2006-07-28 07:40:17 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2006-07-28 07:40:17 +0000 |
| commit | 8d0941a9c861360297da7045a7667194c5378daa (patch) | |
| tree | 183d39c7eacc5aa6d4dcc80ced7f61a89384b6f9 /libjava/java | |
| parent | b82f782bfb5c4383ac0bc1e37271ab3bbeb9304d (diff) | |
| download | gcc-8d0941a9c861360297da7045a7667194c5378daa.zip gcc-8d0941a9c861360297da7045a7667194c5378daa.tar.gz gcc-8d0941a9c861360297da7045a7667194c5378daa.tar.bz2 | |
prims.cc (_Jv_CreateJavaVM): Move setting runtimeInitialized from the start to the end of the function.
2006-07-28 Gary Benson <gbenson@redhat.com>
* prims.cc (_Jv_CreateJavaVM): Move setting runtimeInitialized
from the start to the end of the function. Remove references
to VMThrowable.trace_enabled.
* java/lang/natVMThrowable.cc (fillInStackTrace): Use
runtimeInitialized rather than trace_enabled to decide
whether to inhibit stack trace generation.
* java/lang/VMThrowable.java (trace_enabled): Removed.
From-SVN: r115791
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/VMThrowable.java | 6 | ||||
| -rw-r--r-- | libjava/java/lang/natVMThrowable.cc | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libjava/java/lang/VMThrowable.java b/libjava/java/lang/VMThrowable.java index c5e5861..9dde28d 100644 --- a/libjava/java/lang/VMThrowable.java +++ b/libjava/java/lang/VMThrowable.java @@ -1,5 +1,6 @@ /* java.lang.VMThrowable -- VM support methods for Throwable. - Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2002, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,9 +77,6 @@ final class VMThrowable */ native StackTraceElement[] getStackTrace(Throwable t); - // Setting this flag to false prevents fillInStackTrace() from running. - static boolean trace_enabled = true; - // Native stack data. private RawDataManaged data; } diff --git a/libjava/java/lang/natVMThrowable.cc b/libjava/java/lang/natVMThrowable.cc index 6db1a1f..b198f90 100644 --- a/libjava/java/lang/natVMThrowable.cc +++ b/libjava/java/lang/natVMThrowable.cc @@ -1,6 +1,6 @@ // natVMThrowable.cc - Native part of VMThrowable class. -/* Copyright (C) 2003 Free Software Foundation +/* Copyright (C) 2003, 2006 Free Software Foundation This file is part of libgcj. @@ -27,7 +27,7 @@ java::lang::VMThrowable::fillInStackTrace (java::lang::Throwable *) using namespace java::lang; // Don't trace stack during initialization of the runtime. - if (! trace_enabled) + if (! gcj::runtimeInitialized) return NULL; _Jv_StackTrace *trace = _Jv_StackTrace::GetStackTrace (); |