changeset 4477:b5db9d29062f

Merge
author vlivanov
date Thu, 11 Apr 2013 11:42:41 -0700
parents d79859ff6535 9befe2fce567
children 7a5aec879506
files
diffstat 2 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp	Thu Apr 11 07:12:09 2013 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Thu Apr 11 11:42:41 2013 -0700
@@ -1723,9 +1723,6 @@
       } else {
         coll->set_contended_group(0); // default contended group
       }
-      coll->set_contended(true);
-    } else {
-      coll->set_contended(false);
     }
   }
 }
--- a/src/share/vm/classfile/classFileParser.hpp	Thu Apr 11 07:12:09 2013 -0700
+++ b/src/share/vm/classfile/classFileParser.hpp	Thu Apr 11 11:42:41 2013 -0700
@@ -150,7 +150,6 @@
     void set_contended_group(u2 group) { _contended_group = group; }
     u2 contended_group() { return _contended_group; }
 
-    void set_contended(bool contended) { set_annotation(_sun_misc_Contended); }
     bool is_contended() { return has_annotation(_sun_misc_Contended); }
   };