Merge branch '2.1.x' into 2.2.x

grails · Oct 1, 2012 · 112de72 · 112de72
2 parents 7ac9b65 + f4027e7
commit 112de72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/grails-bootstrap/src/main/resources/springloaded.properties b/grails-bootstrap/src/main/resources/springloaded.properties
@@ -0,0 +1,2 @@
+excluded.loaders=DEFAULT,org.codehaus.groovy.grails.compiler.web.pages.GroovyPageClassLoader,org.codehaus.groovy.runtime.callsite.CallSiteClassLoader
+exclusions=sun..*,groovy..*,org.codehaus.groovy..*,gant..*,org.codehaus.gant..*,com.sun..*,org.bouncycastle..*,org.apache..*,groovyjarjarantlr..*,javassist..*,javax..*,jline..*,net.sf.ehcache..*,net.sf.cglib..*,org.aopalliance..*,org.aspectj..*,org.w3c..*,org.dom4j..*,org.eclipse.jdt..*,org.fusesource.jansi..*,org.grails.datastore.gorm.*,org.grails.datastore.mapping.*,org.hibernate..*,org.hamcrest..*,junit..*,org.hsqldb..*,org.junit..*,org.radeonx..*,org.springframework..*,org.xmlpull..*,com.opensymphony..*,org.xhtmlrenderer..*,org.yaml..*
diff --git a/...s-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateEngine.java b/...s-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateEngine.java
@@ -655,7 +655,7 @@ private Class<?> compileGroovyPage(InputStream in, String name, String pageName,
     }
 
     private synchronized GroovyClassLoader findOrInitGroovyClassLoader() {
-        if (!(classLoader instanceof GroovyClassLoader)) {
+        if (!(classLoader instanceof GroovyPageClassLoader)) {
             classLoader = initGroovyClassLoader(classLoader);
         }
         return (GroovyClassLoader)classLoader;