diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-28 07:40:17 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-28 07:40:17 +0000 |
| commit | 11c79049f3a6379362badd782a71666b520b8518 (patch) | |
| tree | 183d39c7eacc5aa6d4dcc80ced7f61a89384b6f9 /libjava/java | |
| parent | e7206175a0c8d920040676e96ec750fa6493abf7 (diff) | |
| download | ppe42-gcc-11c79049f3a6379362badd782a71666b520b8518.tar.gz ppe42-gcc-11c79049f3a6379362badd782a71666b520b8518.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115791 138bc75d-0d04-0410-961f-82ee72b054a4
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 c5e5861e175..9dde28d293b 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 6db1a1fd56d..b198f90732e 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 (); |
