Merge
authorbrutisso
Mon, 30 Jan 2012 05:08:09 -0800
changeset 11627 e138808edce0
parent 11625 8f12c85b9a6b (diff)
parent 11626 7423003cc783 (current diff)
child 11628 13155c0c00b4
Merge
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp	Mon Jan 30 12:36:49 2012 +0100
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp	Mon Jan 30 05:08:09 2012 -0800
@@ -570,9 +570,9 @@
   void set_method_annotations_of(int idnum, typeArrayOop anno)
                                                 { set_methods_annotations_of(idnum, anno, &_methods_annotations); }
   void set_method_parameter_annotations_of(int idnum, typeArrayOop anno)
-                                                { set_methods_annotations_of(idnum, anno, &_methods_annotations); }
+                                                { set_methods_annotations_of(idnum, anno, &_methods_parameter_annotations); }
   void set_method_default_annotations_of(int idnum, typeArrayOop anno)
-                                                { set_methods_annotations_of(idnum, anno, &_methods_annotations); }
+                                                { set_methods_annotations_of(idnum, anno, &_methods_default_annotations); }
 
   // allocation
   DEFINE_ALLOCATE_PERMANENT(instanceKlass);