From 4cfefe8d4c05ad95fbbe46ee39ae19ee3478094e Mon Sep 17 00:00:00 2001
From: David Kron <davidkron@users.noreply.github.com>
Date: Tue, 24 Aug 2021 18:36:58 +0200
Subject: [PATCH] fix for issue #53

---
 .../grails/web/sitemesh/GroovyPageLayoutFinder.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java b/grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java
index e49ec63a07..0354622d13 100644
--- a/grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java
+++ b/grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GroovyPageLayoutFinder.java
@@ -37,6 +37,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.core.Ordered;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.ViewResolver;
 
@@ -51,7 +52,7 @@
  * @author Graeme Rocher
  * @since 2.0
  */
-public class GroovyPageLayoutFinder implements ApplicationListener<ContextRefreshedEvent>{
+public class GroovyPageLayoutFinder implements ApplicationListener<ContextRefreshedEvent>, Ordered {
     public static final String LAYOUT_ATTRIBUTE = "org.grails.layout.name";
     public static final String NONE_LAYOUT = "_none_";
     public static final String RENDERING_VIEW_ATTRIBUTE = "org.grails.rendering.view";
@@ -59,6 +60,8 @@ public class GroovyPageLayoutFinder implements ApplicationListener<ContextRefres
     private static final long LAYOUT_CACHE_EXPIRATION_MILLIS = Long.getLong("grails.gsp.reload.interval", 5000);
     private static final String LAYOUTS_PATH = "/layouts";
 
+    private static final int ORDER = Ordered.LOWEST_PRECEDENCE - 1;
+
     private Map<String, DecoratorCacheValue> decoratorCache = new ConcurrentHashMap<String, DecoratorCacheValue>();
     private Map<LayoutCacheKey, DecoratorCacheValue> layoutDecoratorCache = new ConcurrentHashMap<LayoutCacheKey, DecoratorCacheValue>();
 
@@ -68,6 +71,11 @@ public class GroovyPageLayoutFinder implements ApplicationListener<ContextRefres
     private ViewResolver viewResolver;
     private boolean enableNonGspViews = false;
 
+    @Override
+    public int getOrder() {
+        return ORDER;
+    }
+
     public void setDefaultDecoratorName(String defaultDecoratorName) {
         this.defaultDecoratorName = defaultDecoratorName;
     }