### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java,v retrieving revision 1.119 diff -u -r1.119 MethodVerifier15.java --- compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java 1 Nov 2010 14:15:47 -0000 1.119 +++ compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java 6 Nov 2010 12:20:47 -0000 @@ -89,6 +89,24 @@ } boolean areTypesEqual(TypeBinding one, TypeBinding two) { if (one == two) return true; + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=329584 + switch(one.kind()) { + case Binding.TYPE: + switch (two.kind()) { + case Binding.PARAMETERIZED_TYPE: + case Binding.RAW_TYPE: + if (one == two.erasure()) + return true; + } + break; + case Binding.RAW_TYPE: + case Binding.PARAMETERIZED_TYPE: + switch(two.kind()) { + case Binding.TYPE: + if (one.erasure() == two) + return true; + } + } // need to consider X and X as the same 'type' if (one.isParameterizedType() && two.isParameterizedType()) #P org.eclipse.jdt.core.tests.compiler Index: src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java,v retrieving revision 1.208 diff -u -r1.208 MethodVerifyTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java 5 Nov 2010 20:47:44 -0000 1.208 +++ src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java 6 Nov 2010 12:21:00 -0000 @@ -11183,7 +11183,7 @@ null); } //https://bugs.eclipse.org/bugs/show_bug.cgi?id=329584 -public void _test329584() { +public void test329584() { Map compilerOptions15 = getCompilerOptions(); compilerOptions15.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, CompilerOptions.VERSION_1_5); compilerOptions15.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5);