Skip to content

Commit 470b19e

Browse files
committed
Merge pull request #9703 from yvesf/fix-9701
Use ResourceUtils to determine if plugin is a jar
2 parents 4989a87 + 76298c9 commit 470b19e

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import grails.core.GrailsApplication;
1919
import grails.io.IOUtils;
20+
import grails.io.ResourceUtils;
2021
import grails.plugins.exceptions.PluginException;
2122
import org.grails.core.io.StaticResourceLoader;
2223
import org.springframework.core.io.Resource;
@@ -52,7 +53,6 @@ public class BinaryGrailsPlugin extends DefaultGrailsPlugin {
5253
private final Map<String, Class> precompiledViewMap = new HashMap<String, Class>();
5354
private final Resource baseResource;
5455
private final Resource baseResourcesResource;
55-
private final String baseResourceString;
5656
private final boolean isJar;
5757
private final File projectDirectory;
5858

@@ -72,12 +72,10 @@ public BinaryGrailsPlugin(Class<?> pluginClass, BinaryGrailsPluginDescriptor des
7272
}
7373
this.baseResource = new UrlResource(rootResource);
7474
try {
75-
this.baseResourceString = baseResource.getURL().toString();
75+
this.isJar = ResourceUtils.isJarURL(baseResource.getURL());
7676
} catch (IOException e) {
7777
throw new PluginException("Cannot evaluate plugin location for plugin " + pluginClass, e);
7878
}
79-
80-
this.isJar = baseResourceString.startsWith("jar:");
8179
this.projectDirectory = isJar ? null : IOUtils.findApplicationDirectoryFile(pluginClass);
8280

8381
URL rootResourcesURL = IOUtils.findRootResourcesURL(pluginClass);

0 commit comments

Comments
 (0)