From b759fb59e660f4583fe5b5de9cdef86a455b03f4 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Thu, 22 Sep 2011 20:08:50 +0400
Subject: [PATCH] KT-315 I need list of FunctionDEscriptors to be taken from
 traits One of the duplicates must remain in the list

---
 .../src/org/jetbrains/jet/lang/resolve/OverridingUtil.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
index 8e402bf1c52..2ca2700119e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
@@ -42,6 +42,8 @@ public class OverridingUtil {
                 if (overrides(other, me)) {
                     continue outerLoop;
                 }
+            }
+            for (D other : candidates) {
                 if (me.getOriginal() == other.getOriginal()
                         && isOverridableBy(JetTypeChecker.INSTANCE, other, me).isSuccess()
                         && isOverridableBy(JetTypeChecker.INSTANCE, me, other).isSuccess()) {