From a0d8cefe1687f169d261515c98e2724472bb19c6 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 29 May 2014 20:58:01 +0400
Subject: [PATCH] Minor. If's with the same condition merged

---
 .../jetbrains/jet/lang/resolve/OverridingUtil.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
index 9ae925fa88a..5975c2c6e6c 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
@@ -99,7 +99,10 @@ public class OverridingUtil {
         List<JetType> subValueParameters = compiledValueParameters(subDescriptor);
 
         if (forOverride) {
-            if (superDescriptor.getTypeParameters().size() != subDescriptor.getTypeParameters().size()) {
+            List<TypeParameterDescriptor> superTypeParameters = superDescriptor.getTypeParameters();
+            List<TypeParameterDescriptor> subTypeParameters = subDescriptor.getTypeParameters();
+
+            if (superTypeParameters.size() != subTypeParameters.size()) {
                 for (int i = 0; i < superValueParameters.size(); ++i) {
                     JetType superValueParameterType = getUpperBound(superValueParameters.get(i));
                     JetType subValueParameterType = getUpperBound(subValueParameters.get(i));
@@ -110,12 +113,6 @@ public class OverridingUtil {
                 }
                 return OverrideCompatibilityInfo.valueParameterTypeMismatch(null, null, OverrideCompatibilityInfo.Result.CONFLICT);
             }
-        }
-
-        if (forOverride) {
-
-            List<TypeParameterDescriptor> superTypeParameters = superDescriptor.getTypeParameters();
-            List<TypeParameterDescriptor> subTypeParameters = subDescriptor.getTypeParameters();
 
             BiMap<TypeConstructor, TypeConstructor> axioms = HashBiMap.create();
             for (int i = 0, typeParametersSize = superTypeParameters.size(); i < typeParametersSize; i++) {