From bc5c90ccc8d482b2d7d98122fca25f5e3e2aa7ca Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 11 Mar 2013 16:33:00 +0100
Subject: [PATCH] EA-44725 - assert:
 PsiDiamondTypeImpl.resolveInferredTypesNoCheck (cherry picked from commit
 9ad4847e6febec4239f129fdb8e56110c66d4b6d)

---
 .../src/com/intellij/psi/PsiDiamondTypeImpl.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
index d4ef980c03e9..e2b6ba6715d4 100644
--- a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
@@ -129,7 +129,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
     final PsiExpressionList argumentList = newExpression.getArgumentList();
     if (argumentList == null) return DiamondInferenceResult.NULL_RESULT;
     final Ref<PsiMethod> staticFactoryRef = new Ref<PsiMethod>();
-    final PsiSubstitutor inferredSubstitutor = ourDiamondGuard.doPreventingRecursion(newExpression, true, new Computable<PsiSubstitutor>() {
+    final PsiSubstitutor inferredSubstitutor = ourDiamondGuard.doPreventingRecursion(newExpression, false, new Computable<PsiSubstitutor>() {
       @Override
       public PsiSubstitutor compute() {
         final PsiMethod constructor = findConstructor(psiClass, newExpression);
@@ -149,7 +149,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
     }
     final PsiMethod staticFactory = staticFactoryRef.get();
     if (staticFactory == null) {
-      LOG.assertTrue(false);
+      LOG.error(inferredSubstitutor);
       return DiamondInferenceResult.NULL_RESULT;
     }
     final PsiTypeParameter[] parameters = staticFactory.getTypeParameters();