From 1b3ee14efb53cb1863739913f50f0fffe088ee43 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 25 Jan 2016 20:50:25 +0300 Subject: [PATCH] EA-77459 - NPE: RefactoringChangeUtil.getTypeByExpression --- .../com/intellij/refactoring/util/RefactoringChangeUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-psi-impl/src/com/intellij/refactoring/util/RefactoringChangeUtil.java b/java/java-psi-impl/src/com/intellij/refactoring/util/RefactoringChangeUtil.java index a5b8c31e860c..eebdd17ab745 100644 --- a/java/java-psi-impl/src/com/intellij/refactoring/util/RefactoringChangeUtil.java +++ b/java/java-psi-impl/src/com/intellij/refactoring/util/RefactoringChangeUtil.java @@ -46,7 +46,7 @@ public class RefactoringChangeUtil { } public static PsiType getTypeByExpression(PsiExpression expr) { - PsiType type = expr.getType(); + PsiType type = expr != null ? expr.getType() : null; if (type == null) { if (expr instanceof PsiArrayInitializerExpression) { PsiExpression[] initializers = ((PsiArrayInitializerExpression)expr).getInitializers();