a static candidate method must not be a instance candidate method at the same time

lhotari · lhotari · commit e45e167c22bd · 2013-11-07T09:51:07.000+02:00
diff --git a/grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/AbstractGrailsArtefactTransformer.java b/grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/AbstractGrailsArtefactTransformer.java
@@ -272,7 +272,7 @@ protected boolean isCandidateInstanceMethod(ClassNode classNode, MethodNode decl
     }
 
     protected boolean isStaticCandidateMethod(ClassNode classNode, MethodNode declaredMethod) {
-        return GrailsASTUtils.isCandidateMethod(declaredMethod);
+        return GrailsASTUtils.isCandidateMethod(declaredMethod) && !isCandidateInstanceMethod(classNode, declaredMethod);
     }
 
     private MethodNode createStaticLookupMethod(ClassNode classNode, ClassNode implementationNode, String apiProperty, String lookupMethodName) {

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ protected boolean isCandidateInstanceMethod(ClassNode classNode, MethodNode decl`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`protected boolean isStaticCandidateMethod(ClassNode classNode, MethodNode declaredMethod) {`
`275`		`- return GrailsASTUtils.isCandidateMethod(declaredMethod);`
	`275`	`+ return GrailsASTUtils.isCandidateMethod(declaredMethod) && !isCandidateInstanceMethod(classNode, declaredMethod);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`private MethodNode createStaticLookupMethod(ClassNode classNode, ClassNode implementationNode, String apiProperty, String lookupMethodName) {`