From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 6 Apr 2005 17:41:05 +0000 (+0000)
Subject: 2005-04-06  Bryce McKinlay  <mckinlay@redhat.com>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=646a7d4a4bdb6444f1834c9aa45489cb0396c348;p=thirdparty%2Fgcc.git

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().


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97737 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f38aac5a52e4..c369ea543568 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+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().
+
 2005-04-05  Andrew Haley  <aph@redhat.com>
 
 	* gnu/gcj/tools/gcj_dbtool/Main.java (Fileset): New class.
@@ -38,6 +43,7 @@
 	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.