From 066ab8ad1bf43d3bda525ce747d7e6ddaf2446cc Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 24 Apr 2014 18:29:30 +0200
Subject: [PATCH] EA-55374 - NPE: DataFlowInspectionBase$.applyFix

---
 .../codeInspection/dataFlow/DataFlowInspectionBase.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
index 69a0476ca096..ec1589d72b34 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -322,8 +322,11 @@ public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
             return;
           }
 
+          PsiElement problemElement = descriptor.getPsiElement();
+          if (problemElement == null) return;
+
           JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
-          PsiElement newElement = descriptor.getPsiElement().replace(facade.getElementFactory().createExpressionFromText(exprText, null));
+          PsiElement newElement = problemElement.replace(facade.getElementFactory().createExpressionFromText(exprText, null));
           newElement = JavaCodeStyleManager.getInstance(project).shortenClassReferences(newElement);
           if (newElement instanceof PsiJavaCodeReferenceElement) {
             PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)newElement;