From e141f833928e7996903fb0fe69633d82ca8019e5 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 13 Jun 2012 19:07:03 +0400
Subject: [PATCH] EA-36406 - assert: TypeEvaluator.evaluateType

---
 .../com/intellij/refactoring/typeMigration/TypeEvaluator.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
index 7b12bc349967..67e643841567 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
@@ -200,8 +200,7 @@ public class TypeEvaluator {
                 return elseType;
 
               case 3:
-                LOG.error("Condition type conflict.");
-                return null;
+                return expr.getType();
 
               default:
                 LOG.error("Must not happen.");