From cc68fcabc648be812087ff4484a31968786e1685 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Tue, 27 Sep 2011 12:35:03 +0400
Subject: [PATCH] Multiple errors of the same kind fixed

---
 .../org/jetbrains/jet/lang/resolve/OverrideResolver.java    | 2 +-
 .../checkerWithErrorTypes/quick/OverridingVarByVal.jet      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
index a59a66ac7ff..dfd60ff8dd5 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
@@ -261,7 +261,7 @@ public class OverrideResolver {
 
                     if (checkPropertyKind(overridden, true) && checkPropertyKind(declared, false) && !kindMismatchError) {
                         context.getTrace().report(VAR_OVERRIDDEN_BY_VAL.on(member, ((JetProperty) member).getValOrVarNode(), (PropertyDescriptor) declared, (PropertyDescriptor) overridden));
-                        typeMismatchError = true;
+                        kindMismatchError = true;
                     }
                 }
             }
diff --git a/idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet b/idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet
index d77e85744b9..e14eef6b41e 100644
--- a/idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet
+++ b/idea/testData/checkerWithErrorTypes/quick/OverridingVarByVal.jet
@@ -2,7 +2,11 @@ open class Var() {
   open var v : Int = 1
 }
 
-class Val() : Var() {
+trait VarT {
+  var v : Int
+}
+
+class Val() : Var(), VarT {
   override <!VAR_OVERRIDDEN_BY_VAL!>val<!> v : Int = 1
 }