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

Timestamp:

04/23/09 16:49:40 (15 years ago)

Author:

kgrading

Message:

various changes (#467)

Location:

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

Files:

• Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core-3.2.csproj (modified) (1 diff)
• PluginCache.cs (modified) (1 diff)

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

@@ -143 +143 @@
           abortRequested = true;
           beat.StopHeartBeat();
+          WcfService.Instance.Logout(ConfigManager.Instance.GetClientInfo().Id);
           break;
       }
@@ -210 +211 @@
           files.AddRange(plugininfo.PluginFiles);
         
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine), files);
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, null, files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/HeuristicLab.Hive.Client.Core-3.2.csproj

@@ -143 +143 @@
       <Name>HeuristicLab.Hive.Contracts-3.2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Hive.Engine\3.2\HeuristicLab.Hive.Engine-3.2.csproj">
-      <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
-      <Name>HeuristicLab.Hive.Engine-3.2</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.2\HeuristicLab.Hive.JobBase-3.2.csproj">
       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>

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

@@ -35 +35 @@
       List<HivePluginInfo> missingPlugins = new List<HivePluginInfo>();
       bool found = false;
-      
-      //Todo: Fix the whole equals thing here
+            
       foreach (HivePluginInfo info in requests) {
+        //we MAY run in problems here - if there is a plugin twice in requests, there may be added two different versions of the plugin
         foreach (CachedHivePluginInfo cache in pluginCache) {
-          if (info.Equals(cache)) {
+          if (info.Name.Equals(cache.Name) && info.Version.Equals(cache.Version) && info.BuildDate <= cache.BuildDate) {
             neededPlugins.Add(cache);
             found = true;