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

Timestamp:

06/21/11 17:29:56 (13 years ago)

Author:

ascheibe

Message:

#1233

• some Admin UI bugfixes

Slave:

• fixed bug when Pause is called immediately after Calculate
• send exceptions when something goes wrong in Pause or Stop

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

@@ -202 +202 @@
           case ExecutorMessageType.JobFailed:
             executorMonitoringRun = false;
-            OnJobFailed(new JobFailedException(executor.CurrentException));
+            OnJobFailed(new JobFailedException(executor.CurrentExceptionStr));
             DisposeAppDomain();
             break;
@@ -208 +208 @@
           case ExecutorMessageType.StopExecutorMonitoringThread:
             executorMonitoringRun = false;
-            return;
+            break;
+
+          case ExecutorMessageType.ExceptionOccured:
+            executorMonitoringRun = false;
+            DisposeAppDomain();
+            if (executor.CurrentException != null) {
+              OnExceptionOccured(executor.CurrentException);
+            } else {
+              OnExceptionOccured(new Exception(string.Format("Unknow exception occured in Executor for job {0}", JobId)));
+            }
+            break;
         }
       }