--- old/src/share/vm/classfile/classLoaderData.cpp	2017-08-14 10:53:15.623134402 -0400
+++ new/src/share/vm/classfile/classLoaderData.cpp	2017-08-14 10:53:15.287796250 -0400
@@ -759,14 +759,15 @@
   return metaspace;
 }
 
-jobject ClassLoaderData::add_handle(Handle h) {
+OopHandle ClassLoaderData::add_handle(Handle h) {
   MutexLockerEx ml(metaspace_lock(),  Mutex::_no_safepoint_check_flag);
-  return (jobject) _handles.add(h());
+  return OopHandle(_handles.add(h()));
 }
 
-void ClassLoaderData::remove_handle_unsafe(jobject h) {
-  assert(_handles.contains((oop*) h), "Got unexpected handle " PTR_FORMAT, p2i((oop*) h));
-  *((oop*) h) = NULL;
+void ClassLoaderData::remove_handle_unsafe(OopHandle h) {
+  oop* obj = h.ptr();
+  assert(_handles.contains(obj), "Got unexpected handle " PTR_FORMAT, p2i(obj));
+  *(obj) = NULL;
 }
 
 // Add this metadata pointer to be freed when it's safe.  This is only during