Merge
authorjiangli
Tue, 13 Nov 2018 15:13:36 -0500
changeset 52504 29977ee892ad
parent 52503 7d3b82b338f7 (diff)
parent 52502 4ca6a67d1672 (current diff)
child 52505 7e6010986c73
Merge
--- a/src/hotspot/share/memory/metaspaceShared.cpp	Tue Nov 13 12:11:34 2018 -0800
+++ b/src/hotspot/share/memory/metaspaceShared.cpp	Tue Nov 13 15:13:36 2018 -0500
@@ -338,12 +338,6 @@
       ClassLoaderExt::init_app_module_paths_start_index(header->_app_module_paths_start_index);
     }
   }
-
-  if (DumpSharedSpaces) {
-    if (SharedArchiveConfigFile) {
-      read_extra_data(SharedArchiveConfigFile, THREAD);
-    }
-  }
 }
 
 void MetaspaceShared::read_extra_data(const char* filename, TRAPS) {
@@ -1705,6 +1699,12 @@
 
     log_info(cds)("Shared spaces: preloaded %d classes", class_count);
 
+    if (SharedArchiveConfigFile) {
+      tty->print_cr("Reading extra data from %s ...", SharedArchiveConfigFile);
+      read_extra_data(SharedArchiveConfigFile, THREAD);
+    }
+    tty->print_cr("Reading extra data: done.");
+
     HeapShared::init_subgraph_entry_fields(THREAD);
 
     // Rewrite and link classes