From 800fe8ddcd7473a49cf8cae401a2baf09f7c14b0 Mon Sep 17 00:00:00 2001 From: aph Date: Fri, 4 Jan 2008 17:18:56 +0000 Subject: 2008-01-04 Andrew Haley PR libgcj/34444 * java/lang/natClass.cc (Class::getEnclosingClass): Call getDeclaringClass(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131326 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/natClass.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libjava/java/lang/natClass.cc') diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 47d7739c715..5b141605f92 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -1043,7 +1043,8 @@ java::lang::Class::getEnclosingClass() _Jv_word indexes; indexes.i = getEnclosingMethodData(); if (indexes.i == 0) - return NULL; + // No enclosing method, but perhaps a member or anonymous class + return getDeclaringClass(); _Jv_ushort class_index, method_index; _Jv_loadIndexes (&indexes, class_index, method_index); return _Jv_Linker::resolve_pool_entry (this, class_index).clazz; -- cgit v1.2.3