Addon dependency shutdown is working

forge · Jan 25, 2013 · dfbb21b · dfbb21b
1 parent d39899e
commit dfbb21b
Showing 1 changed file with 12 additions and 10 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
@@ -136,33 +136,29 @@ public Future<Addon> start(Addon addon)
    public void stop(Addon addon)
    {
       Assert.notNull(addon, "Addon must not be null.");
-      AddonImpl addonImpl = (AddonImpl) getRegisteredAddon(addon.getId());
+      AddonImpl addonToStop = (AddonImpl) getRegisteredAddon(addon.getId());
 
-      Set<AddonImpl> stopped = new HashSet<AddonImpl>();
       for (AddonImpl dependentAddon : addons)
       {
          for (AddonDependency dependency : dependentAddon.getDependencies())
          {
             if (addon.getId().equals(dependency.getId()) && dependentAddon.getFuture() != null)
             {
                stop(dependentAddon);
-               stopped.add(dependentAddon);
             }
          }
       }
-
-      addons.removeAll(stopped);
 
       synchronized (addons)
       {
-         if (addonImpl != null)
+         if (addonToStop != null)
          {
-            Future<Addon> future = addonImpl.getFuture();
+            Future<Addon> future = addonToStop.getFuture();
             try
             {
-               if (future != null)
+               if (future != null && addon.getStatus().isStarted())
                {
-                  addonImpl.getRunnable().shutdown();
+                  addonToStop.getRunnable().shutdown();
                }
             }
             catch (Exception e)
@@ -173,6 +169,8 @@ public void stop(Addon addon)
             {
                if (future != null && !future.isDone())
                   future.cancel(true);
+
+               addons.remove(addonToStop);
             }
          }
       }
@@ -234,7 +232,11 @@ public void updateAddons()
             toRemove.add(addon);
          }
       }
-      addons.removeAll(toRemove);
+
+      for (Addon addon : toRemove)
+      {
+         stop(addon);
+      }
 
       for (AddonId entry : enabledCompatible)
       {