Changeset 6381 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/JobManager.cs

Timestamp:

06/08/11 00:04:16 (13 years ago)

Author:

cneumuel

Message:

#1233

• locking for childHiveJobs in OptimizerHiveJob avoid multi threaded access issues
• added IsPrivileged to gui
• minor changes

File:

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

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Manager/JobManager.cs

@@ -86 +86 @@
         }
         catch (Exception) {
+          RemoveSlaveJob(job.Id, slaveJob); // clean up and rethrow
           slaveJob.DisposeAppDomain();
-          RemoveSlaveJob(job.Id, slaveJob); // clean up and rethrow
           throw;
         }
@@ -268 +268 @@
         if (jobData == null) throw new SerializationException();
       }
-      catch { }
+      catch { /* jobData will be null */ }
       SlaveStatusInfo.IncrementJobsFailed();
       OnJobFailed(slaveJob, jobData, e.Value2);