Mercurial > hg > truffle

comparison src/share/vm/classfile/classLoaderData.inline.hpp @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 1cb4795305b9
children de6a9e811145
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
41 41
42 inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader, TRAPS) { 42 inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader, TRAPS) {
43 assert(loader() != NULL,"Must be a class loader"); 43 assert(loader() != NULL,"Must be a class loader");
44 // Gets the class loader data out of the java/lang/ClassLoader object, if non-null 44 // Gets the class loader data out of the java/lang/ClassLoader object, if non-null
45 // it's already in the loader_data, so no need to add 45 // it's already in the loader_data, so no need to add
46 ClassLoaderData** loader_data_addr = java_lang_ClassLoader::loader_data_addr(loader()); 46 ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data(loader());
47 ClassLoaderData* loader_data_id = *loader_data_addr; 47 if (loader_data) {
48 if (loader_data_id) { 48 return loader_data;
49 return loader_data_id;
50 } 49 }
51 return ClassLoaderDataGraph::add(loader_data_addr, loader, THREAD); 50 return ClassLoaderDataGraph::add(loader, false, THREAD);
52 } 51 }