Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.2.x'

  • Loading branch information...
commit f6c93401a68943b58cb96ed11a3729b4177915eb 2 parents b2808b9 + 112de72
@lhotari lhotari authored
View
2  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..*
View
2  grails-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateEngine.java
@@ -655,7 +655,7 @@ private String getPathForResource(Resource res) {
}
private synchronized GroovyClassLoader findOrInitGroovyClassLoader() {
- if (!(classLoader instanceof GroovyClassLoader)) {
+ if (!(classLoader instanceof GroovyPageClassLoader)) {
classLoader = initGroovyClassLoader(classLoader);
}
return (GroovyClassLoader)classLoader;
Please sign in to comment.
Something went wrong with that request. Please try again.