Changeset 2527 for branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Manager/PluginManager.cs

Timestamp:

11/23/09 20:27:43 (15 years ago)

Author:

gkronber

Message:

Implemented changes as requested by swagner. #799

File:

• branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Manager/PluginManager.cs (modified) (2 diffs)

branches/PluginInfrastructure Refactoring/HeuristicLab.PluginInfrastructure/Manager/PluginManager.cs

@@ -104 +104 @@
         AppDomain.Unload(pluginDomain);
         // unload all plugins
-        foreach (var pluginDescription in plugins)
+        foreach (var pluginDescription in plugins.Where(x => x.PluginState == PluginState.Loaded))
           pluginDescription.Unload();
         initialized = true;
@@ -128 +128 @@
         setup.PrivateBinPath = pluginDir;
         applicationDomain = AppDomain.CreateDomain(appInfo.Name, null, setup);
-        Type applicationManagerType = typeof(DefaultApplicationManager);
-        DefaultApplicationManager applicationManager =
-          (DefaultApplicationManager)applicationDomain.CreateInstanceAndUnwrap(applicationManagerType.Assembly.FullName, applicationManagerType.FullName, true, BindingFlags.NonPublic | BindingFlags.Instance, null, null, null, null, null);
+        Type applicationManagerType = typeof(ApplicationManager);
+        ApplicationManager applicationManager =
+          (ApplicationManager)applicationDomain.CreateInstanceAndUnwrap(applicationManagerType.Assembly.FullName, applicationManagerType.FullName, true, BindingFlags.NonPublic | BindingFlags.Instance, null, null, null, null, null);
         applicationManager.PluginLoaded += applicationManager_PluginLoaded;
         applicationManager.PluginUnloaded += applicationManager_PluginUnloaded;