Changeset 1481 for trunk/sources/HeuristicLab.Hive.Client.Core

Timestamp:

04/02/09 13:52:55 (15 years ago)

Author:

kgrading

Message:

bugfix of shutdown (#473)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core

Files:

• Core.cs (modified) (2 diffs)
• CoreApplication.cs (modified) (1 diff)
• PluginCache.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -103 +103 @@
         DetermineAction(container);
       }
+      Console.WriteLine("ended!");
     }    
 
@@ -137 +138 @@
         //Hard shutdown of the client
         case MessageContainer.MessageType.Shutdown:
+          lock (engines) {
+            foreach (KeyValuePair<Guid, AppDomain> kvp in appDomains)
+              AppDomain.Unload(kvp.Value);
+          }
           abortRequested = true;
           beat.StopHeartBeat();

trunk/sources/HeuristicLab.Hive.Client.Core/CoreApplication.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Hive.Client.Core {
-  [ClassInfo(Name = "Hive Client", Description = "Hive Client Core baseclass", AutoRestart = true)]
+  [ClassInfo(Name = "Hive Client", Description = "Hive Client Core baseclass", AutoRestart = false)]
   public class CoreApplication: ApplicationBase {
     public override void Run() {

trunk/sources/HeuristicLab.Hive.Client.Core/PluginCache.cs

@@ -37 +37 @@
 
       List<CachedPlugin> receivedPlugins = WcfService.Instance.RequestPlugins(missingPlugins);
-      if (receivedPlugins != null)
+      if (receivedPlugins != null) {
         neededPlugins.AddRange(receivedPlugins);
-      else
+        pluginCache.AddRange(receivedPlugins);
+      } else
         Logging.Instance.Error(this.ToString(), "Fetching of the plugins failed!");