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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Fri Feb 18 15:55:20 2011 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Wed Feb 23 14:16:12 2011 +0000
     1.3 @@ -1679,7 +1679,8 @@
     1.4                              "(" + types.memberType(t2, s2).getParameterTypes() + ")");
     1.5                          return s2;
     1.6                      }
     1.7 -                } else if (checkNameClash((ClassSymbol)site.tsym, s1, s2)) {
     1.8 +                } else if (checkNameClash((ClassSymbol)site.tsym, s1, s2) &&
     1.9 +                        !checkCommonOverriderIn(s1, s2, site)) {
    1.10                      log.error(pos,
    1.11                              "name.clash.same.erasure.no.override",
    1.12                              s1, s1.location(),