From 8a751ad74ab08d2ec200f2d384ce99c15f648d11 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 28 May 2015 18:42:51 +0300 Subject: [PATCH] Call Hierachy: Fix NPE #EA-67995 Fixed --- .../hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index 9fe0eb50188..5ef28e6f5e9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -79,7 +79,8 @@ public class KotlinCallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i @Override public final boolean isValid(){ - return myElement.isValid(); + //noinspection ConstantConditions + return myElement != null && myElement.isValid(); } @Override