# HG changeset patch
# User vlivanov
# Date 1365705761 25200
# Node ID 6299fa379219457150d703ca68ed121bf7179a2f
# Parent  c117eee6d38aa8d726597c3bfb5a1200c578be03# Parent  b6d3c26b219220a9c8c7b8972f79540fc950f557
Merge

diff -r c117eee6d38a -r 6299fa379219 hotspot/src/share/vm/classfile/classFileParser.cpp
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Thu Apr 11 07:12:09 2013 -0700
+++ b/hotspot/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 c117eee6d38a -r 6299fa379219 hotspot/src/share/vm/classfile/classFileParser.hpp
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp	Thu Apr 11 07:12:09 2013 -0700
+++ b/hotspot/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); }
   };