Merge pull request #367 from codeconsole/enableReload

Race condition: GroovyPagesTemplateRenderer.afterPropertiesSet() is c…
grails · Aug 25, 2023 · 7def2c7 · 7def2c7
2 parents cfcda70 + 3c8a687
commit 7def2c7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy
@@ -201,7 +201,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
         }
 
         // Setup the main templateEngine used to render GSPs
-        groovyPagesTemplateEngine(GroovyPagesTemplateEngine) { bean ->
+        groovyPagesTemplateEngine(GroovyPagesTemplateEngine) {
             classLoader = ref("classLoader")
             groovyPageLocator = groovyPageLocator
             if (enableReload) {
@@ -221,6 +221,9 @@ class GroovyPagesGrailsPlugin extends Plugin {
 
         groovyPagesTemplateRenderer(GroovyPagesTemplateRenderer) { bean ->
             bean.autowire = true
+            if (enableReload) {
+                reloadEnabled = enableReload
+            }
         }
 
         // Setup the GroovyPagesUriService

diff --git a/grails-web-gsp/src/main/groovy/org/grails/web/gsp/GroovyPagesTemplateRenderer.java b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/GroovyPagesTemplateRenderer.java
@@ -86,7 +86,15 @@ public void afterPropertiesSet() throws Exception {
             generateViewMethod = ReflectionUtils.findMethod(scaffoldingTemplateGenerator.getClass(), "generateView", new Class<?>[] {
                 GrailsDomainClass.class, String.class, Writer.class});
         }
-        reloadEnabled = groovyPagesTemplateEngine.isReloadEnabled();
+    }
+
+    /**
+     * Sets whether reloading is enabled
+     *
+     * @param reloadEnabled True if it is enabled
+     */
+    public void setReloadEnabled(boolean reloadEnabled) {
+        this.reloadEnabled = reloadEnabled;
     }
 
     public void clearCache() {