JavaDescriptorResolver should not crash if there is no original for alt-header

(before this commit it crashed because package was not searched in alt-headers)

This commit makes JDR ignore alt-header if original is not found
This commit is contained in:
Stepan Koltsov
2012-05-30 21:04:25 +04:00
parent 570789512f
commit 3a3cbd53d8
2 changed files with 17 additions and 0 deletions
@@ -75,8 +75,13 @@ public class PsiClassFinderForJvm implements PsiClassFinder {
public PsiClass findPsiClass(@NotNull FqName qualifiedName, @NotNull RuntimeClassesHandleMode runtimeClassesHandleMode) {
PsiClass original = javaFacade.findClass(qualifiedName.getFqName(), javaSearchScope);
PsiClass altClass = altClassFinder.findClass(qualifiedName);
PsiClass result = original;
if (altClass != null) {
if (original == null) {
return null;
}
if (altClass instanceof ClsClassImpl) {
altClass.putUserData(ClsClassImpl.DELEGATE_KEY, original);
}