OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natLogger.cc (getCallerStackFrame): Don't crash on NULL klass and meth values from _Jv_StackTrace::GetCallerInfo(). 

2005-04-06  Bryce McKinlay  <mckinlay@redhat.com>

	* java/util/logging/natLogger.cc (getCallerStackFrame): Don't crash
	on NULL klass and meth values from _Jv_StackTrace::GetCallerInfo().

From-SVN: r97739
This commit is contained in:
Bryce McKinlay 2005-04-06 18:42:23 +01:00
parent 55b12f0d74
commit e3eff25ac1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libjava/ChangeLog
View File

@ -43,7 +43,6 @@
Handle error cases. Added 'endp' argument.
* include/jvm.h (_Jv_FindClassFromSignature): Updated prototype.
>>>>>>> 1.3459
2005-04-05 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.

10
libjava/java/util/logging/natLogger.cc
View File

@ -34,10 +34,16 @@ java::util::logging::Logger::getCallerStackFrame ()
_Jv_Method *meth = NULL;
_Jv_StackTrace::GetCallerInfo (&Logger::class$, &klass, &meth);
jstring meth_name = NULL;
jstring klass_name = NULL;
if (klass != NULL)
klass_name = klass->getName();
if (meth != NULL)
meth_name = _Jv_NewStringUtf8Const (meth->name);
java::lang::StackTraceElement *e
= new java::lang::StackTraceElement
(JvNewStringUTF (""), 0,
klass->getName(), _Jv_NewStringUtf8Const (meth->name), false);
(JvNewStringUTF (""), 0, klass_name, meth_name, false);
return e;
}