Fixed spurious exception when optional depenency was missing

forge · Dec 7, 2012 · fd9e1ec · fd9e1ec
1 parent 48a03d5
commit fd9e1ec
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/container/src/main/java/org/jboss/forge/container/modules/AddonModuleLoader.java b/container/src/main/java/org/jboss/forge/container/modules/AddonModuleLoader.java
@@ -152,7 +152,7 @@ private void addAddonDependencies(AddonId found, Builder builder) throws Contain
                      PathFilters.not(PathFilters.getMetaInfFilter()),
                      dependency.isExport() ? PathFilters.acceptAll() : PathFilters.rejectAll(),
                      this,
-                     moduleId,
+                     toModuleId(dependency.getId()),
                      dependency.isOptional()));
          }
       }
@@ -187,13 +187,18 @@ private ModuleIdentifier findCompatibleInstalledModule(AddonDependency dependenc
 
       if (found != null)
       {
-         String[] split = found.toModuleId().split(":");
-         return ModuleIdentifier.create(split[0], split[1]);
+         return toModuleId(found);
       }
 
       return null;
    }
 
+   public ModuleIdentifier toModuleId(AddonId id)
+   {
+      String[] split = id.toModuleId().split(":");
+      return ModuleIdentifier.create(split[0], split[1]);
+   }
+
    @Override
    public String toString()
    {