--- a/hotspot/src/share/vm/oops/cpCache.cpp	Thu Apr 25 03:58:53 2013 -0700
+++ b/hotspot/src/share/vm/oops/cpCache.cpp	Thu Apr 25 12:55:49 2013 -0700
@@ -266,7 +266,8 @@
   // the lock, so that when the losing writer returns, he can use the linked
   // cache entry.
 
-  MonitorLockerEx ml(cpool->lock());
+  oop cplock = cpool->lock();
+  ObjectLocker ol(cplock, Thread::current(), cplock != NULL);
   if (!is_f1_null()) {
     return;
   }