--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Tue Jun 16 11:58:25 2015 +0200
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Tue Jun 16 15:59:57 2015 +0200
@@ -381,6 +381,9 @@
     if (!constants()->is_shared()) {
       MetadataFactory::free_metadata(loader_data, constants());
     }
+    // Delete any cached resolution errors for the constant pool
+    SystemDictionary::delete_resolution_error(constants());
+
     set_constants(NULL);
   }