Do not try to load Java classes from incorrect packages

#KT-11474 Fixed
This commit is contained in:
Alexander Udalov
2017-05-16 14:23:33 +03:00
parent 52237ce77f
commit bfb3b38ebc
6 changed files with 32 additions and 7 deletions
@@ -80,13 +80,11 @@ class LazyJavaPackageScope(
)
}
val javaClassFqName = javaClass?.fqName ?: return@classByRequest null
assert(!javaClassFqName.isRoot && javaClassFqName.parent() == ownerDescriptor.fqName) {
"Java class by request $requestClassId should be contained in package ${ownerDescriptor.fqName}, but it's fq-name: $javaClassFqName"
}
LazyJavaClassDescriptor(c, ownerDescriptor, javaClass)
val actualFqName = javaClass?.fqName
if (actualFqName == null || actualFqName.isRoot || actualFqName.parent() != ownerDescriptor.fqName)
null
else
LazyJavaClassDescriptor(c, ownerDescriptor, javaClass)
}
}
}