equal
deleted
inserted
replaced
111 ResourceMark rm(THREAD); |
111 ResourceMark rm(THREAD); |
112 if (package == NULL) return NULL; |
112 if (package == NULL) return NULL; |
113 const char *package_name = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(package)); |
113 const char *package_name = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(package)); |
114 if (package_name == NULL) return NULL; |
114 if (package_name == NULL) return NULL; |
115 TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK_NULL); |
115 TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK_NULL); |
116 PackageEntryTable* package_entry_table = module_entry->loader()->packages(); |
116 PackageEntryTable* package_entry_table = module_entry->loader_data()->packages(); |
117 assert(package_entry_table != NULL, "Unexpected null package entry table"); |
117 assert(package_entry_table != NULL, "Unexpected null package entry table"); |
118 return package_entry_table->lookup_only(pkg_symbol); |
118 return package_entry_table->lookup_only(pkg_symbol); |
119 } |
119 } |
120 |
120 |
121 static PackageEntry* get_package_entry_by_name(Symbol* package, |
121 static PackageEntry* get_package_entry_by_name(Symbol* package, |
866 |
866 |
867 log_debug(modules)("add_module_package(): Adding package %s to module %s", |
867 log_debug(modules)("add_module_package(): Adding package %s to module %s", |
868 package_name, module_entry->name()->as_C_string()); |
868 package_name, module_entry->name()->as_C_string()); |
869 |
869 |
870 TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK); |
870 TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK); |
871 PackageEntryTable* package_table = module_entry->loader()->packages(); |
871 PackageEntryTable* package_table = module_entry->loader_data()->packages(); |
872 assert(package_table != NULL, "Missing package_table"); |
872 assert(package_table != NULL, "Missing package_table"); |
873 |
873 |
874 bool pkg_exists = false; |
874 bool pkg_exists = false; |
875 { |
875 { |
876 MutexLocker ml(Module_lock, THREAD); |
876 MutexLocker ml(Module_lock, THREAD); |