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/cf6a6c7c Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/cf6a6c7c Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/cf6a6c7c Branch: refs/heads/GROOVY_2_6_X Commit: cf6a6c7c541d5d68157d2a51932203edd98be595 Parents: 5748573 Author: Paul King <[email protected]> Authored: Sun Apr 1 23:39:10 2018 +1000 Committer: Paul King <[email protected]> Committed: Sun Apr 1 23:41:20 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/cf6a6c7c/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);
