Attachment 104541 Details for Bug 236096 – Proposed patch

[patch] Proposed patch

patch.txt (text/plain), 1.22 KB, created by Kent Johnson

on 2008-06-11 15:05:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kent Johnson

Created: 2008-06-11 15:05:20 EDT

Size: 1.22 KB

patch

obsolete

>### 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.88
>diff -u -r1.88 MethodVerifier15.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java	27 May 2008 22:21:12 -0000	1.88
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java	11 Jun 2008 19:02:48 -0000
>@@ -744,8 +744,10 @@
> 	}
> 
> 	if (substituteMethod instanceof ParameterizedGenericMethodBinding) {
>+		if (method.typeVariables != Binding.NO_TYPE_VARIABLES)
>+			return !((ParameterizedGenericMethodBinding) substituteMethod).isRaw;
> 		// since substituteMethod has substituted type variables, method cannot have a generic signature AND no variables -> its a name clash if it does
>-		return ! (hasGenericParameter(method) && method.typeVariables == Binding.NO_TYPE_VARIABLES);
>+		return !hasGenericParameter(method);
> 	}
> 
> 	// if method has its own variables, then substituteMethod failed bounds check in computeSubstituteMethod()

Actions: View | Diff

Attachments on bug 236096: 104541