From 0badc22c353ce24d76e8fbfab9eb51162a51e509 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 5 Oct 2015 13:16:21 +0200 Subject: [PATCH] EA-62894 - NPE: EncapsulateFieldsProcessor.processUsagesPerFile --- .../encapsulateFields/EncapsulateFieldsProcessor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java index 687981cbbbed..83b07135cdac 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java @@ -340,7 +340,9 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { CommonRefactoringUtil.sortDepthFirstRightLeftOrder(infos); for (EncapsulateFieldUsageInfo info : infos) { - EncapsulateFieldHelper helper = EncapsulateFieldHelper.getHelper(info.getElement().getLanguage()); + final PsiElement element = info.getElement(); + if (element == null) continue; + EncapsulateFieldHelper helper = EncapsulateFieldHelper.getHelper(element.getLanguage()); helper.processUsage(info, myDescriptor, myNameToSetter.get(info.getFieldDescriptor().getSetterName()),