--- a/hotspot/src/share/vm/runtime/fieldDescriptor.cpp	Thu Nov 13 11:14:01 2014 +0100
+++ b/hotspot/src/share/vm/runtime/fieldDescriptor.cpp	Fri Nov 14 09:47:09 2014 +0100
@@ -94,7 +94,7 @@
 }
 
 oop fieldDescriptor::string_initial_value(TRAPS) const {
-  return constants()->uncached_string_at(initial_value_index(), CHECK_0);
+  return constants()->uncached_string_at(initial_value_index(), THREAD);
 }
 
 void fieldDescriptor::reinitialize(InstanceKlass* ik, int index) {