Fixes resolve views in the 'app/views/' of BinaryPlugin

graceframework · Sep 29, 2022 · a71f72b · a71f72b
1 parent fbf1bd1
commit a71f72b
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java b/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java
@@ -213,16 +213,21 @@ else if (pagePlugin != null) {
     }
 
     protected GroovyPageScriptSource resolveViewInBinaryPlugin(BinaryGrailsPlugin binaryPlugin, String uri) {
-        GroovyPageScriptSource scriptSource = null;
-        uri = removeViewLocationPrefixes(uri);
-        uri = GrailsResourceUtils.appendPiecesForUri(PATH_TO_WEB_INF_VIEWS, uri);
-        Class<?> viewClass = binaryPlugin.resolveView(uri);
-        if (viewClass != null && !this.reloadedPrecompiledGspClassNames.contains(viewClass.getName())) {
-            scriptSource = createGroovyPageCompiledScriptSource(uri, uri, viewClass);
-            // we know we have binary plugin, sp setting to null in the resourceCallable to skip reloading.
-            ((GroovyPageCompiledScriptSource) scriptSource).setResourceCallable(null);
+        for (String dir : Arrays.asList("grails-app", "app")) {
+            GroovyPageScriptSource scriptSource = null;
+            String fullUri = removeViewLocationPrefixes(uri);
+            fullUri = GrailsResourceUtils.appendPiecesForUri("/WEB-INF/" + dir + "/views", fullUri);
+            Class<?> viewClass = binaryPlugin.resolveView(fullUri);
+            if (viewClass != null && !this.reloadedPrecompiledGspClassNames.contains(viewClass.getName())) {
+                scriptSource = createGroovyPageCompiledScriptSource(uri, fullUri, viewClass);
+                // we know we have binary plugin, sp setting to null in the resourceCallable to skip reloading.
+                ((GroovyPageCompiledScriptSource) scriptSource).setResourceCallable(null);
+            }
+            if (scriptSource != null) {
+                return scriptSource;
+            }
         }
-        return scriptSource;
+        return null;
     }
 
     protected GroovyPageCompiledScriptSource createGroovyPageCompiledScriptSource(final String uri, String fullPath, Class<?> viewClass) {