Mercurial > hg > truffle

diff src/share/vm/oops/constantPool.cpp @ 17891:b6a2ba7d3ea7 hs25.20-b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 17 Apr 2014 16:09:07 -0700
parents 9428a0b94204
children 78bbf4d43a14
line wrap: on
line diff
--- a/src/share/vm/oops/constantPool.cpp	Wed Apr 16 12:32:23 2014 -0700
+++ b/src/share/vm/oops/constantPool.cpp	Thu Apr 17 16:09:07 2014 -0700
@@ -144,6 +144,10 @@
 // CDS support. Create a new resolved_references array.
 void ConstantPool::restore_unshareable_info(TRAPS) {
 
+  // Only create the new resolved references array and lock if it hasn't been
+  // attempted before
+  if (resolved_references() != NULL) return;
+
   // restore the C++ vtable from the shared archive
   restore_vtable();