From e37cf6b6a1fef003f28f91c174a2c5557e6aa202 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Sun, 15 Mar 2015 12:52:47 +0300
Subject: [PATCH] Minor, change method contract to @NotNull

---
 .../src/org/jetbrains/kotlin/resolve/DescriptorUtils.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
index cd21f7e8adb..46b4411edeb 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
@@ -314,16 +314,16 @@ public class DescriptorUtils {
         return superClassDescriptors;
     }
 
-    @Nullable
+    @NotNull
     public static JetType getSuperClassType(@NotNull ClassDescriptor classDescriptor) {
         Collection<JetType> superclassTypes = classDescriptor.getTypeConstructor().getSupertypes();
         for (JetType type : superclassTypes) {
             ClassDescriptor superClassDescriptor = getClassDescriptorForType(type);
-            if (!isAny(superClassDescriptor) && superClassDescriptor.getKind() != ClassKind.TRAIT) {
+            if (superClassDescriptor.getKind() != ClassKind.TRAIT) {
                 return type;
             }
         }
-        return null;
+        return KotlinBuiltIns.getInstance().getAnyType();
     }
 
     @NotNull