--- a/hotspot/src/share/vm/ci/ciReplay.cpp	Thu Nov 13 11:14:01 2014 +0100
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp	Fri Nov 14 09:47:09 2014 +0100
@@ -332,7 +332,7 @@
   // Lookup a klass
   Klass* resolve_klass(const char* klass, TRAPS) {
     Symbol* klass_name = SymbolTable::lookup(klass, (int)strlen(klass), CHECK_NULL);
-    return SystemDictionary::resolve_or_fail(klass_name, _loader, _protection_domain, true, CHECK_NULL);
+    return SystemDictionary::resolve_or_fail(klass_name, _loader, _protection_domain, true, THREAD);
   }
 
   // Parse the standard tuple of <klass> <name> <signature>