Changeset 6248 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs

Timestamp:

05/23/11 11:26:27 (13 years ago)

Author:

ascheibe

Message:

#1233

• don't set job failed if JobNotFoundException is thrown
• disable AboutView for all items
• avoid NullRefException in SendFinishedJob

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveJob.cs

@@ -165 +165 @@
         try {
           JobData sJob = executor.GetFinishedJob();
-          clientCom.LogMessage(string.Format("Sending the finished job with id: {0}", JobId));
-          wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
+          if (sJob != null) {
+            clientCom.LogMessage(string.Format("Sending the finished job with id: {0}", JobId));
+            wcfService.UpdateJobData(job, sJob, ConfigManager.Instance.GetClientInfo().Id, JobState.Finished);
+          }
         }
         catch (Exception e) {
@@ -210 +212 @@
       if (pluginsPrepared) {
         try {
-          appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
+          appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitPrivilegedSandbox(job.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName));
           appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException);