You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/04/01 13:09:37 UTC
groovy git commit: formatting
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X d1d875387 -> 0f3ed8d6b
formatting
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0f3ed8d6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0f3ed8d6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0f3ed8d6
Branch: refs/heads/GROOVY_2_5_X
Commit: 0f3ed8d6bc03e78065907063083362b36b731ff7
Parents: d1d8753
Author: Paul King <pa...@asert.com.au>
Authored: Sun Apr 1 23:09:29 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sun Apr 1 23:09:29 2018 +1000
----------------------------------------------------------------------
.../runtime/metaclass/MetaClassRegistryImpl.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/0f3ed8d6/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
index ff30a2b..2914d02 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaClassRegistryImpl.java
@@ -513,22 +513,22 @@ public class MetaClassRegistryImpl implements MetaClassRegistry{
public void onModule(final ExtensionModule module) {
if (moduleRegistry.hasModule(module.getName())) {
- ExtensionModule loadedModule = moduleRegistry.getModule(module.getName());
- if (loadedModule.getVersion().equals(module.getVersion())) {
- // already registered
- return;
- } else {
- throw new GroovyRuntimeException("Conflicting module versions. Module ["+module.getName()+" is loaded in version "+
- loadedModule.getVersion()+" and you are trying to load version "+module.getVersion());
+ ExtensionModule loadedModule = moduleRegistry.getModule(module.getName());
+ if (loadedModule.getVersion().equals(module.getVersion())) {
+ // already registered
+ return;
+ } else {
+ throw new GroovyRuntimeException("Conflicting module versions. Module [" + module.getName() + " is loaded in version " +
+ loadedModule.getVersion() + " and you are trying to load version " + module.getVersion());
+ }
}
- }
moduleRegistry.addModule(module);
// register MetaMethods
List<MetaMethod> metaMethods = module.getMetaMethods();
for (MetaMethod metaMethod : metaMethods) {
CachedClass cachedClass = metaMethod.getDeclaringClass();
List<MetaMethod> methods = map.get(cachedClass);
- if (methods==null) {
+ if (methods == null) {
methods = new ArrayList<MetaMethod>(4);
map.put(cachedClass, methods);
}