From 39c40d4b51e1496544e629f549a3d291c00638df Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 22 Nov 2016 11:39:08 +0100
Subject: [PATCH] NPE

---
 .../graphInference/constraints/TypeCompatibilityConstraint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java
index 6583588d8f90..a32eca123ac9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeCompatibilityConstraint.java
@@ -87,7 +87,7 @@ public class TypeCompatibilityConstraint implements ConstraintFormula {
         }
       }
     } 
-    else if (t instanceof PsiArrayType && t.getArrayDimensions() == s.getArrayDimensions()) {
+    else if (t instanceof PsiArrayType && s != null && t.getArrayDimensions() == s.getArrayDimensions()) {
       return isUncheckedConversion(t.getDeepComponentType(), s.getDeepComponentType());
     }
     return false;