azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EA-36257 - NPE: DecompiledDataFactory.appendDescriptor

Browse Source 
Added assert in only place where source of NPE may appear.
This commit is contained in:
Evgeny Gerashchenko
2012-09-07 15:33:07 +04:00
parent 44a70669d7
commit 17932f1b7c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+4 -1
View File
@@ -1891,7 +1891,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
if (innerPsiClass.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) { if (innerPsiClass.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
continue; continue;
} }
r.add(resolveClass(new FqName(innerPsiClass.getQualifiedName()), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN)); ClassDescriptor classDescriptor = resolveClass(new FqName(innerPsiClass.getQualifiedName()),
DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN);
assert classDescriptor != null: "couldn't resolve class " + innerPsiClass.getQualifiedName();
r.add(classDescriptor);
} }
return r; return r;
} }