Merge
authorchegar
Mon, 22 Jul 2013 14:01:39 +0100
changeset 20659 645d4575ada2
parent 20658 e8fcfaaae93a (diff)
parent 18736 c37fce37f43e (current diff)
child 20660 811bc9304728
Merge
hotspot/src/share/vm/memory/klassInfoClosure.hpp
hotspot/src/share/vm/runtime/aprofiler.cpp
hotspot/src/share/vm/runtime/aprofiler.hpp
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Thu Jul 18 03:38:10 2013 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Mon Jul 22 14:01:39 2013 +0100
@@ -4481,9 +4481,8 @@
   for (int index = 0; index < num_methods; index++) {
     Method* m = methods->at(index);
 
-    // skip private, static and <init> methods
-    if ((!m->is_private()) &&
-        (!m->is_static()) &&
+    // skip static and <init> methods
+    if ((!m->is_static()) &&
         (m->name() != vmSymbols::object_initializer_name())) {
 
       Symbol* name = m->name();