1.1 --- a/src/share/vm/oops/constantPool.cpp Thu Feb 13 10:05:03 2014 +0100 1.2 +++ b/src/share/vm/oops/constantPool.cpp Tue Apr 15 17:02:20 2014 -0400 1.3 @@ -144,6 +144,10 @@ 1.4 // CDS support. Create a new resolved_references array. 1.5 void ConstantPool::restore_unshareable_info(TRAPS) { 1.6 1.7 + // Only create the new resolved references array and lock if it hasn't been 1.8 + // attempted before 1.9 + if (resolved_references() != NULL) return; 1.10 + 1.11 // restore the C++ vtable from the shared archive 1.12 restore_vtable(); 1.13