archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 17:44:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8158681: ClassLoader::classloader_type() is called from code not included under #if INCLUDE_CDS

Browse source 
Place CDS related code under #if INCLUDE_CDS.

Reviewed-by: lfoltan, gtriantafill, coleenp
This commit is contained in:
Jiangli Zhou 2016-06-08 18:47:05 -04:00
parent fecc46c774
commit 81ff3b7d93
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/classfile/classLoaderExt.hpp
View file

@ -54,12 +54,14 @@ public:
const s2 classpath_index, const s2 classpath_index,
instanceKlassHandle result, TRAPS) { instanceKlassHandle result, TRAPS) {
if (ClassLoader::add_package(_file_name, classpath_index, THREAD)) { if (ClassLoader::add_package(_file_name, classpath_index, THREAD)) {
#if INCLUDE_CDS
if (DumpSharedSpaces) { if (DumpSharedSpaces) {
s2 classloader_type = ClassLoader::classloader_type( s2 classloader_type = ClassLoader::classloader_type(
class_name, e, classpath_index, CHECK_(result)); class_name, e, classpath_index, CHECK_(result));
result->set_shared_classpath_index(classpath_index); result->set_shared_classpath_index(classpath_index);
result->set_class_loader_type(classloader_type); result->set_class_loader_type(classloader_type);
} }
#endif
return result; return result;
} else { } else {
return instanceKlassHandle(); // NULL return instanceKlassHandle(); // NULL