From 17932f1b7cbf9f6d06859fe4da2c51862824cdac Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 7 Sep 2012 15:33:07 +0400 Subject: [PATCH] EA-36257 - NPE: DecompiledDataFactory.appendDescriptor Added assert in only place where source of NPE may appear. --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index f293f803a8f..7c18fba3610 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -1891,7 +1891,10 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes if (innerPsiClass.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) { 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; }