From 20256d215dc574ac80b7f2dbf6e5349ae1d3d9ff Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 3 Nov 2015 20:44:24 +0100
Subject: [PATCH] @NotNull

---
 .../src/com/intellij/psi/PsiResolveHelper.java           | 2 +-
 .../psi/impl/source/resolve/PsiResolveHelperImpl.java    | 2 +-
 .../source/resolve/graphInference/InferenceSession.java  | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiResolveHelper.java b/java/java-psi-api/src/com/intellij/psi/PsiResolveHelper.java
index 2e3de888a0ed..b63c9b545109 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiResolveHelper.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiResolveHelper.java
@@ -54,7 +54,7 @@ public interface PsiResolveHelper {
    * @return the result of the resolve, or {@link JavaResolveResult#EMPTY} if the resolve failed.
    */
   @NotNull
-  JavaResolveResult resolveConstructor(PsiClassType type, PsiExpressionList argumentList, PsiElement place);
+  JavaResolveResult resolveConstructor(PsiClassType type, @NotNull PsiExpressionList argumentList, PsiElement place);
 
   /**
    * Resolves a constructor and returns all variants for the resolve.
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
index f78a5165345b..124cb3e8c2a8 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
@@ -39,7 +39,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
 
   @Override
   @NotNull
-  public JavaResolveResult resolveConstructor(PsiClassType classType, PsiExpressionList argumentList, PsiElement place) {
+  public JavaResolveResult resolveConstructor(PsiClassType classType, @NotNull PsiExpressionList argumentList, PsiElement place) {
     JavaResolveResult[] result = multiResolveConstructor(classType, argumentList, place);
     return result.length == 1 ? result[0] : JavaResolveResult.EMPTY;
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
index 9ec62f0f4d6e..59acb5a3cba7 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
@@ -456,9 +456,12 @@ public class InferenceSession {
             final PsiElement psiClass = resolveResult.getElement();
             if (psiClass != null) {
               final JavaPsiFacade facade = JavaPsiFacade.getInstance(callExpression.getProject());
-              constructor = facade.getResolveHelper().resolveConstructor(facade.getElementFactory().createType((PsiClass)psiClass).rawType(),
-                                                                         callExpression.getArgumentList(), 
-                                                                         callExpression);
+              final PsiExpressionList argumentList = callExpression.getArgumentList();
+              if (argumentList != null) {
+                constructor = facade.getResolveHelper().resolveConstructor(facade.getElementFactory().createType((PsiClass)psiClass).rawType(),
+                                                                           argumentList,
+                                                                           callExpression);
+              }
             }
           }
           return new Result<JavaResolveResult>(constructor.getElement() == null && resolveResult != null ? resolveResult : constructor,