Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Feb 07 18:09:46 2011 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Mon Feb 07 18:10:13 2011 +0000
     1.3 @@ -709,7 +709,11 @@
     1.4  
     1.5              // If we override any other methods, check that we do so properly.
     1.6              // JLS ???
     1.7 -            chk.checkClashes(tree.pos(), env.enclClass.type, m);
     1.8 +            if (m.isStatic()) {
     1.9 +                chk.checkHideClashes(tree.pos(), env.enclClass.type, m);
    1.10 +            } else {
    1.11 +                chk.checkOverrideClashes(tree.pos(), env.enclClass.type, m);
    1.12 +            }
    1.13              chk.checkOverride(tree, m);
    1.14  
    1.15              // Create a new environment with local scope