From 743c14f239292bb75565b5d142f1a55176cdfd73 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 4 May 2012 19:06:57 +0400
Subject: [PATCH] JDR: hide static members from superclasses

#KT-1880 Fixed
---
 .../jet/lang/resolve/java/JavaDescriptorResolverHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
index 381a89f9594..17e5b0b94cc 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
@@ -70,7 +70,7 @@ class JavaDescriptorResolverHelper {
                 return false;
             }
 
-            if (!staticMembers && member.getPsiMember().getContainingClass() != psiClass.getPsiClass()) {
+            if (member.getPsiMember().getContainingClass() != psiClass.getPsiClass()) {
                 return false;
             }