--- a/JavaNativeMethodImpl_OpenJDK6.st	Tue Dec 09 15:06:58 2014 +0000
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Tue Dec 09 16:18:53 2014 +0000
@@ -10003,15 +10003,15 @@
     attr := cls getAttribute: #EnclosingMethod.
     attr notNil ifTrue:[ 
         info := _java_lang_Object_CLASS javaArrayClass new: 3.
-        info at: 1 put: (JavaVM reflection javaClassObjectForClass: (attr first resolve: false)).
-        attr second notNil ifTrue:[ 
-            info at: 2 put: (Java as_String: attr second name).
-            info at: 3 put: (Java as_String: attr second descriptor).
+        info at: 1 put: (JavaVM reflection javaClassObjectForClass: ((cls constantPool at: attr first) resolve: false)).
+        attr second ~~ 0 ifTrue:[ 
+            info at: 2 put: (Java as_String: (cls constantPool at: attr second) name).
+            info at: 3 put: (Java as_String: (cls constantPool at: attr second) descriptor).
         ].
     ].
     ^ info.
 
-    "Modified: / 13-08-2014 / 17:04:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 03-12-2014 / 13:04:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _java_lang_Class_getGenericSignature: this