AddonRegistryImpl now reuses LockManager provided by Forge

forge · Apr 22, 2013 · a1f8f33 · a1f8f33 · lincolnthree · Apr 23, 2013
1 parent edb4f71
commit a1f8f33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/container/src/main/java/org/jboss/forge/container/ForgeImpl.java b/container/src/main/java/org/jboss/forge/container/ForgeImpl.java
@@ -50,7 +50,7 @@ public ForgeImpl()
          logger.warning("Could not detect Forge runtime version - " +
                   "loading all addons, but failures may occur if versions are not compatible.");
 
-      registry = new AddonRegistryImpl(this, lock);
+      registry = new AddonRegistryImpl(this);
    }
 
    @Override

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
@@ -66,13 +66,13 @@ public class AddonRegistryImpl implements AddonRegistry
 
    private AddonModuleLoader loader;
 
-   public AddonRegistryImpl(Forge forge, LockManager lock)
+   public AddonRegistryImpl(Forge forge)
    {
       Assert.notNull(forge, "Forge instance must not be null.");
-      Assert.notNull(lock, "LockManager must not be null.");
+      Assert.notNull(forge.getLockManager(), "LockManager must not be null.");
 
       this.forge = forge;
-      this.lock = lock;
+      this.lock = forge.getLockManager();
       this.tree = new AddonTree(lock);
 
       logger.log(Level.FINE, "Instantiated AddonRegistryImpl: " + this);