Changeset 279 for branches/3.0/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

Timestamp:

05/30/08 13:41:27 (16 years ago)

Author:

gkronber

Message:

merged changesets r219:r228, r240, r241:258, r263:265, r267,r268, r269 from trunk into the HL3 stable branch

File:

• branches/3.0/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (1 diff)

branches/3.0/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -103 +103 @@
       setup.PrivateBinPath = pluginDir;
       AppDomain applicationDomain = AppDomain.CreateDomain(appInfo.Name + " AppDomain", null, setup);
-
-      Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure.Runner");
-      NotifyListeners(PluginManagerAction.Initializing, "All plugins");
-      remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
-      NotifyListeners(PluginManagerAction.Initialized, "All plugins");
-      remoteRunner.Run(appInfo);
-
-      AppDomain.Unload(applicationDomain);
+      try {
+        Runner remoteRunner = (Runner)applicationDomain.CreateInstanceAndUnwrap("HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure.Runner");
+        NotifyListeners(PluginManagerAction.Initializing, "All plugins");
+        remoteRunner.LoadPlugins(remoteLoader.ActivePlugins);
+        NotifyListeners(PluginManagerAction.Initialized, "All plugins");
+        remoteRunner.Run(appInfo);
+      } catch(Exception ex) {
+        // can't handle exception here -> rethrow 
+        throw new ApplicationException("Exception in "+appInfo.Name, ex);
+      } finally {
+        // make sure domain is unloaded in all cases
+        AppDomain.Unload(applicationDomain);
+      }
     }