From 114485f4140e098a758c908139d8703a5cb731be Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Fri, 22 Nov 2013 15:01:37 +0100
Subject: [PATCH] NPE (cherry picked from commit
 4f8711f13c3a3ebb847d879c0347013397792e84)

---
 .../source/resolve/graphInference/PsiPolyExpressionUtil.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
index e5f00f0ff694..86c0dbc804b6 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
@@ -144,6 +144,7 @@ public class PsiPolyExpressionUtil {
     if (expr instanceof PsiParenthesizedExpression) {
       return isBooleanOrNumeric(((PsiParenthesizedExpression)expr).getExpression());
     }
+    if (expr == null) return null;
     PsiType type = null;
     if (expr instanceof PsiNewExpression || hasStandaloneForm(expr)) {
       type = expr.getType();
@@ -160,7 +161,8 @@ public class PsiPolyExpressionUtil {
       final PsiExpression elseExpression = ((PsiConditionalExpression)expr).getElseExpression();
       final ConditionalKind thenKind = isBooleanOrNumeric(thenExpression);
       final ConditionalKind elseKind = isBooleanOrNumeric(elseExpression);
-      if (thenKind == elseKind) return thenKind;
+      if (thenKind == elseKind || elseKind == null) return thenKind;
+      if (thenKind == null) return elseKind;
     }
     return null;
   }