diff src/share/vm/classfile/classLoaderData.cpp @ 7643:3ac7d10a6572

Merge with hsx25/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 31 Jan 2013 15:42:25 +0100
parents 59a58e20dc60
children 5daaddd917a1
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoaderData.cpp	Thu Jan 31 11:32:14 2013 +0100
+++ b/src/share/vm/classfile/classLoaderData.cpp	Thu Jan 31 15:42:25 2013 +0100
@@ -318,6 +318,7 @@
 }
 
 Metaspace* ClassLoaderData::metaspace_non_null() {
+  assert(!DumpSharedSpaces, "wrong metaspace!");
   // If the metaspace has not been allocated, create a new one.  Might want
   // to create smaller arena for Reflection class loaders also.
   // The reason for the delayed allocation is because some class loaders are