Changeset 766 for trunk/sources/HeuristicLab.Grid

Timestamp:

11/15/08 22:08:33 (15 years ago)

Author:

gkronber

Message:

fixed #362 (GridClient doesn't work since the change to use major.minor version-numbers for plugins)

Location:

trunk/sources/HeuristicLab.Grid

Files:

• EngineRunner.cs (modified) (1 diff)
• GridClient.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Grid/EngineRunner.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using System.Threading;
+using HeuristicLab.PluginInfrastructure;
+using System.Reflection;
 
 namespace HeuristicLab.Grid {

trunk/sources/HeuristicLab.Grid/GridClient.cs

@@ -26 +26 @@
 using System.Diagnostics;
 using System.Threading;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Grid {
@@ -134 +135 @@
         if(gotEngine && !stopped) {
           executing = true;
-          AppDomain engineDomain = AppDomain.CreateDomain("Engine domain", null, AppDomain.CurrentDomain.SetupInformation);
-          EngineRunner runner = (EngineRunner)engineDomain.CreateInstanceAndUnwrap("HeuristicLab.Grid", typeof(EngineRunner).FullName);
+          AppDomain engineDomain = PluginManager.Manager.CreateAndInitAppDomain("Engine domain");
+          Type engineRunnerType = typeof(EngineRunner);
+          
+          EngineRunner runner = (EngineRunner)engineDomain.CreateInstanceAndUnwrap(engineRunnerType.Assembly.GetName().Name, engineRunnerType.FullName);
           byte[] resultXml = runner.Execute(engineXml);
           bool success = false;