archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8077203: Avoid unnecessary stripping of package names from FQN's in is_same_class_package() methods

Browse source 
Extract package name from instance klass's package entry record

Reviewed-by: redestad, coleenp, lfoltan
This commit is contained in:
Harold Seigel 2017-07-20 11:01:20 -04:00
parent 7323412857
commit 9148262d0e
3 changed files with 24 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

51
hotspot/src/share/vm/oops/instanceKlass.cpp
View file

@ -2344,47 +2344,40 @@ bool InstanceKlass::is_same_class_package(const Klass* class2) const {
return false;
}
// return true if this class and other_class are in the same package. Classloader
// and classname information is enough to determine a class's package
bool InstanceKlass::is_same_class_package(oop other_class_loader,
const Symbol* other_class_name) const {
oop this_class_loader = class_loader();
const Symbol* const this_class_name = name();
return InstanceKlass::is_same_class_package(this_class_loader,
this_class_name,
other_class_loader,
other_class_name);
}
// return true if two classes are in the same package, classloader
// and classname information is enough to determine a class's package
bool InstanceKlass::is_same_class_package(oop class_loader1, const Symbol* class_name1,
oop class_loader2, const Symbol* class_name2) {
if (class_loader1 != class_loader2) {
if (class_loader() != other_class_loader) {
return false;
} else if (class_name1 == class_name2) {
return true;
} else {
}
if (name()->fast_compare(other_class_name) == 0) {
return true;
}
{
ResourceMark rm;
bool bad_class_name = false;
const char* name1 = ClassLoader::package_from_name((const char*) class_name1->as_C_string(), &bad_class_name);
const char* other_pkg =
ClassLoader::package_from_name((const char*) other_class_name->as_C_string(), &bad_class_name);
if (bad_class_name) {
return false;
}
// Check that package_from_name() returns NULL, not "", if there is no package.
assert(other_pkg == NULL || strlen(other_pkg) > 0, "package name is empty string");
const char* name2 = ClassLoader::package_from_name((const char*) class_name2->as_C_string(), &bad_class_name);
if (bad_class_name) {
return false;
const Symbol* const this_package_name =
this->package() != NULL ? this->package()->name() : NULL;
if (this_package_name == NULL || other_pkg == NULL) {
// One of the two doesn't have a package. Only return true if the other
// one also doesn't have a package.
return (const char*)this_package_name == other_pkg;
}
if ((name1 == NULL) || (name2 == NULL)) {
// One of the two doesn't have a package. Only return true
// if the other one also doesn't have a package.
return name1 == name2;
}
// Check that package is identical
return (strcmp(name1, name2) == 0);
// Check if package is identical
return this_package_name->equals(other_pkg);
}
}