Merge branch '7.0.x' into renovate/gradle-8.x

grails · Nov 22, 2024 · 503cff4 · 503cff4
2 parents 2338777 + 3b8f4af
commit 503cff4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/FormTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/FormTagLib.groovy
@@ -22,6 +22,7 @@ import grails.gsp.TagLib
 import groovy.transform.CompileStatic
 import groovy.util.logging.Commons
 import org.grails.plugins.web.GrailsTagDateHelper
+import org.springframework.beans.BeansException
 
 import java.text.DateFormat
 import java.text.DateFormatSymbols
@@ -76,6 +77,10 @@ class FormTagLib implements ApplicationContextAware, InitializingBean, TagLibrar
         if (applicationContext.containsBean('mvcConversionService')) {
             conversionService = applicationContext.getBean('mvcConversionService', ConversionService)
         }
+        configureCsrf()
+    }
+
+    void configureCsrf() {
         try {
             var filterChainProxy = applicationContext.getBean(
                     Class.forName("org.springframework.security.web.FilterChainProxy"))
@@ -85,7 +90,7 @@ class FormTagLib implements ApplicationContextAware, InitializingBean, TagLibrar
                 springSecurityCsrfTokenClass =
                         Class.forName("org.springframework.security.web.csrf.CsrfToken")
             }
-        } catch (ClassNotFoundException ignore) {}
+        } catch (ClassNotFoundException | BeansException ignore) {}
     }
 
     /**