Fix FORGE-1037

forge · Jul 25, 2013 · 7220288 · 7220288
1 parent be95250
commit 7220288
Showing 1 changed file with 36 additions and 35 deletions.
diff --git a/container/src/main/java/org/jboss/forge/furnace/impl/modules/AddonModuleLoader.java b/container/src/main/java/org/jboss/forge/furnace/impl/modules/AddonModuleLoader.java
@@ -134,47 +134,48 @@ private ModuleSpec findAddonModule(ModuleIdentifier id)
       if (addon != null)
       {
          Set<AddonView> views = stateManager.getViewsOf(addon);
+         AddonId found = addon.getId();
          for (AddonRepository repository : views.iterator().next().getRepositories())
          {
-            AddonId found = addon.getId();
-            Addon mappedAddon = moduleCache.getAddon(id);
-
-            if (mappedAddon != null && mappedAddon.getId().equals(found))
+            if (repository.isEnabled(found) && repository.isDeployed(found))
             {
-               Builder builder = ModuleSpec.build(id);
+               Addon mappedAddon = moduleCache.getAddon(id);
 
-               builder.addDependency(DependencySpec.createModuleDependencySpec(SystemClasspathSpec.ID));
-               builder.addDependency(DependencySpec.createModuleDependencySpec(XPathJDKClasspathSpec.ID));
-               builder.addDependency(DependencySpec.createModuleDependencySpec(PathFilters.acceptAll(),
-                        PathFilters.rejectAll(), null, FurnaceContainerSpec.ID, false));
-               try
-               {
-                  addContainerDependencies(views, repository, found, builder);
-                  addAddonDependencies(views, repository, found, builder);
-               }
-               catch (ContainerException e)
+               if (mappedAddon != null && mappedAddon.getId().equals(found))
                {
-                  logger.warning(e.getMessage());
-                  return null;
+                  Builder builder = ModuleSpec.build(id);
+
+                  builder.addDependency(DependencySpec.createModuleDependencySpec(SystemClasspathSpec.ID));
+                  builder.addDependency(DependencySpec.createModuleDependencySpec(XPathJDKClasspathSpec.ID));
+                  builder.addDependency(DependencySpec.createModuleDependencySpec(PathFilters.acceptAll(),
+                           PathFilters.rejectAll(), null, FurnaceContainerSpec.ID, false));
+                  try
+                  {
+                     addContainerDependencies(views, repository, found, builder);
+                  }
+                  catch (ContainerException e)
+                  {
+                     logger.warning(e.getMessage());
+                     return null;
+                  }
+
+                  builder.addDependency(DependencySpec.createLocalDependencySpec(PathFilters.acceptAll(),
+                           PathFilters.acceptAll()));
+
+                  try
+                  {
+                     addAddonDependencies(views, repository, found, builder);
+                  }
+                  catch (ContainerException e)
+                  {
+                     logger.warning(e.getMessage());
+                     return null;
+                  }
+
+                  addLocalResources(repository, found, builder, id);
+
+                  return builder.create();
                }
-
-               builder.addDependency(DependencySpec.createLocalDependencySpec(PathFilters.acceptAll(),
-                        PathFilters.acceptAll()));
-
-               try
-               {
-                  addContainerDependencies(views, repository, found, builder);
-                  addAddonDependencies(views, repository, found, builder);
-               }
-               catch (ContainerException e)
-               {
-                  logger.warning(e.getMessage());
-                  return null;
-               }
-
-               addLocalResources(repository, found, builder, id);
-
-               return builder.create();
             }
          }
       }