# HG changeset patch
# User vlivanov
# Date 1365705761 25200
# Node ID b5db9d29062f129dd787fef1703672081efeac43
# Parent  d79859ff6535922461f62ed4df77eea22052677e# Parent  9befe2fce567f2a39ae8fcc41f1871ae80864d32
Merge

diff -r d79859ff6535 -r b5db9d29062f src/share/vm/classfile/classFileParser.cpp
--- 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);
     }
   }
 }
diff -r d79859ff6535 -r b5db9d29062f src/share/vm/classfile/classFileParser.hpp
--- 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); }
   };