Skip to content

Commit 98d3dfd

Browse files
committed
Fix handling of basePlugin. Fixes #9562
1 parent 9eb1de5 commit 98d3dfd

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

grails-core/src/main/groovy/org/grails/plugins/BinaryGrailsPlugin.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
import grails.io.IOUtils;
2020
import grails.io.ResourceUtils;
2121
import grails.plugins.exceptions.PluginException;
22+
import grails.util.BuildSettings;
2223
import org.grails.core.io.StaticResourceLoader;
24+
import org.grails.io.support.GrailsResourceUtils;
2325
import org.springframework.core.io.Resource;
2426
import org.springframework.core.io.UrlResource;
2527
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -78,6 +80,16 @@ public BinaryGrailsPlugin(Class<?> pluginClass, BinaryGrailsPluginDescriptor des
7880
}
7981
this.projectDirectory = isJar ? null : IOUtils.findApplicationDirectoryFile(pluginClass);
8082

83+
if(BuildSettings.BASE_DIR != null && projectDirectory != null) {
84+
try {
85+
if(projectDirectory.getCanonicalPath().startsWith(BuildSettings.BASE_DIR.getCanonicalPath())) {
86+
isBase = true;
87+
}
88+
} catch (IOException e) {
89+
// ignore
90+
}
91+
}
92+
8193
URL rootResourcesURL = IOUtils.findRootResourcesURL(pluginClass);
8294
if(rootResourcesURL == null) {
8395
throw new PluginException("Cannot evaluate plugin location for plugin " + pluginClass);

0 commit comments

Comments
 (0)