Minimizing work in loaders map

forge · Mar 21, 2013 · 87fd821 · 87fd821
1 parent 9a0abcf
commit 87fd821
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java b/container/src/main/java/org/jboss/forge/container/impl/AddonRegistryImpl.java
@@ -578,9 +578,13 @@ private AddonModuleLoader getAddonModuleLoader(AddonRepository repository)
    {
       Assert.notNull(repository, "Repository must not be null.");
 
-      if (!loaders.containsKey(repository))
-         loaders.put(repository, new AddonModuleLoader(repository, forge.getRuntimeClassLoader()));
-      return loaders.get(repository);
+      AddonModuleLoader moduleLoader = loaders.get(repository);
+      if (moduleLoader == null)
+      {
+         moduleLoader = new AddonModuleLoader(repository, forge.getRuntimeClassLoader());
+         loaders.put(repository, moduleLoader);
+      }
+      return moduleLoader;
    }
 
    private void doStop(Addon addon)