Merge branch 'master' of github.com:grails/grails-core

Conflicts: grails-web-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy grails-web-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy
hansgru · Nov 24, 2014 · 17dbf69 · 17dbf69
2 parents 449ed71 + 0ab5561
commit 17dbf69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformation.java b/grails-core/src/main/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformation.java
@@ -17,19 +17,18 @@
 
 import grails.artefact.Artefact;
 import grails.build.logging.GrailsConsole;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
 import grails.compiler.ast.AllArtefactClassInjector;
 import grails.compiler.ast.ClassInjector;
 import grails.compiler.ast.GlobalClassInjector;
 import grails.compiler.ast.GrailsArtefactClassInjector;
 import grails.compiler.traits.TraitInjector;
 import groovy.transform.CompilationUnitAware;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import org.codehaus.groovy.ast.ASTNode;
 import org.codehaus.groovy.ast.AnnotatedNode;
 import org.codehaus.groovy.ast.AnnotationNode;
@@ -184,11 +183,8 @@ public static void doPerformInjectionOnArtefactType(SourceUnit sourceUnit, Class
     public static void performInjection(SourceUnit sourceUnit, ClassNode cNode, Collection<ClassInjector> injectors) {
         try {
             for (ClassInjector injector : injectors) {
-                final String injectorName = injector.getClass().getName();
-                final String key = "Processed_by_" + injectorName;
-                final Object nodeMetaData = cNode.getNodeMetaData(key);
-                if(!Boolean.TRUE.equals(nodeMetaData)) {
-                    cNode.setNodeMetaData(key, Boolean.TRUE);
+                if(!GrailsASTUtils.isApplied(cNode, injector.getClass())) {
+                    GrailsASTUtils.markApplied(cNode, injector.getClass());
                     injector.performInjectionOnAnnotatedClass(sourceUnit, cNode);
                 }
             }

diff --git a/grails-web-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy b/grails-web-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy
@@ -3,6 +3,7 @@ package grails.boot
 import grails.artefact.Artefact
 import grails.boot.config.GrailsAutoConfiguration
 import grails.web.Controller
+
 import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext
 import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory