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

Timestamp:

04/17/09 14:34:13 (15 years ago)

Author:

kgrading

Message:

refactoring (#547)

Location:

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

Files:

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

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

@@ -205 +205 @@
 
         PluginManager.Manager.Initialize();
+        //Todo: make a set & override the equals method
+        List<byte[]> files = new List<byte[]>();
+        foreach (CachedHivePluginInfo plugininfo in PluginCache.Instance.GetPlugins(e.Result.Job.PluginsNeeded))
+          files.AddRange(plugininfo.PluginFiles);
         
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine));
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine), files);
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    

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

@@ -10 +10 @@
 namespace HeuristicLab.Hive.Client.Core {
   public class PluginCache {
+
+    private static PluginCache instance = null;
+    public static PluginCache Instance {
+      get {
+        if (instance == null)
+          instance = new PluginCache();
+        return instance;
+      }
+    } 
+    
     private List<CachedHivePluginInfo> pluginCache;
     
+
     public PluginCache() {
       pluginCache = new List<CachedHivePluginInfo>();
@@ -24 +35 @@
       List<HivePluginInfo> missingPlugins = new List<HivePluginInfo>();
       bool found = false;
+      
+      //Todo: Fix the whole equals thing here
       foreach (HivePluginInfo info in requests) {
         foreach (CachedHivePluginInfo cache in pluginCache) {