smarter extension method detection
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/d4e79252 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/d4e79252 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/d4e79252 Branch: refs/heads/master Commit: d4e7925239a33c0f7eb9a641d03d5da76d1d5b12 Parents: a3ed9d4 Author: Paul King <[email protected]> Authored: Sun Apr 1 23:39:10 2018 +1000 Committer: Paul King <[email protected]> Committed: Sun Apr 1 23:40:34 2018 +1000 ---------------------------------------------------------------------- .../groovy/runtime/m12n/ExtensionModuleScanner.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/d4e79252/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java index 5d59c12..91031dd 100644 --- a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java +++ b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java @@ -50,11 +50,13 @@ public class ExtensionModuleScanner { } public void scanClasspathModules() { + scanClasspathModulesFrom(MODULE_META_INF_FILE); + scanClasspathModulesFrom(LEGACY_MODULE_META_INF_FILE); + } + + private void scanClasspathModulesFrom(String moduleMetaInfFile) { try { - Enumeration<URL> resources = classLoader.getResources(MODULE_META_INF_FILE); - if (!resources.hasMoreElements()) { - resources = classLoader.getResources(LEGACY_MODULE_META_INF_FILE); - } + Enumeration<URL> resources = classLoader.getResources(moduleMetaInfFile); while (resources.hasMoreElements()) { URL url = resources.nextElement(); scanExtensionModuleFromMetaInf(url);
