diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java index 74ac5866d65..cd95eff6e45 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java @@ -106,14 +106,14 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor { return upperBounds; } - private JetTypeParameter resolveUpperBoundsFromWhereClause(Set upperBounds, boolean forClassObject) { + private void resolveUpperBoundsFromWhereClause(Set upperBounds, boolean forClassObject) { JetTypeParameter jetTypeParameter = getElement(); JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(jetTypeParameter, JetClassOrObject.class); if (classOrObject instanceof JetClass) { JetClass jetClass = (JetClass) classOrObject; for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstaints()) { - if (jetTypeConstraint.isClassObjectContraint() == forClassObject) continue; + if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue; JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName(); if (constrainedParameterName != null) { @@ -127,7 +127,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor { } } } - return jetTypeParameter; + } private JetTypeParameter getElement() {