--- a/hotspot/src/share/vm/oops/cpCache.cpp	Mon Oct 21 17:26:46 2013 -0700
+++ b/hotspot/src/share/vm/oops/cpCache.cpp	Tue Oct 22 14:29:02 2013 -0700
@@ -284,8 +284,7 @@
   // the lock, so that when the losing writer returns, he can use the linked
   // cache entry.
 
-  oop cplock = cpool->lock();
-  ObjectLocker ol(cplock, Thread::current(), cplock != NULL);
+  MonitorLockerEx ml(cpool->lock());
   if (!is_f1_null()) {
     return;
   }