Changeset 4912

Timestamp:

11/23/10 18:14:06 (14 years ago)

Author:

cneumuel

Message:

#1297 fixed sandboxmanager fails to load plugins properly

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/Sandboxing/SandboxManager.cs

@@ -55 +55 @@
 
     #region ISandboxManager Members
-
     public static AppDomain CreateAndInitSandbox(string name) {
-      return CreateAndInitSandbox(name, Enumerable.Empty<byte[]>());
-    }
-
-
-    public static AppDomain CreateAndInitSandbox(string name, IEnumerable<byte[]> files) {
       PermissionSet pset;
 
@@ -92 +86 @@
       PluginManager pm = new PluginManager(name);
       pm.DiscoverAndCheckPlugins();
-      ApplicationDescription[] apps = ApplicationManager.Manager.Applications.Cast<ApplicationDescription>().ToArray();
-      PluginDescription[] plugins = ApplicationManager.Manager.Plugins.Cast<PluginDescription>().ToArray();
+      ApplicationDescription[] apps = pm.Applications.Cast<ApplicationDescription>().ToArray();
+      PluginDescription[] plugins = pm.Plugins.Cast<PluginDescription>().ToArray();
       applicationManager.PrepareApplicationDomain(apps, plugins);
-      //if (files != null && files.Count() > 0)
-      //applicationManager.LoadAssemblies(files);
       return applicationDomain;
     }
-
     #endregion
   }