Changeset 3472 for trunk/sources

Timestamp:

04/21/10 18:58:07 (14 years ago)

Author:

gkronber

Message:

Implemented quick fix for #987 (HiveEngine doesn't raise the JobFailed event if an exception occurs in the underlying engine)

File:

• trunk/sources/HeuristicLab.Hive.Engine/3.2/Job.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Engine/3.2/Job.cs

@@ -28 +28 @@
 using System.Xml;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Hive.Engine {
@@ -48 +49 @@
     private void RegisterEvents() {
       engine.Finished += new EventHandler(engine_Finished);
+      engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
     }
 
     private void DeregisterEvents() {
       engine.Finished -= new EventHandler(engine_Finished);
+      engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
     }
 
@@ -57 +60 @@
       if (Engine.Canceled) this.progress = 0.0;
       else this.progress = 1.0;
-      if (JobStopped != null)
-        JobStopped(this, new EventArgs());
+      var listeners = JobStopped;
+      if (listeners != null)
+        listeners(this, e);
     }
+
+    void engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
+      this.progress = 0.0;
+      var listeners = JobFailed;
+      if (listeners != null)
+        listeners(this, e);
+    }
+
 
     #region IJob Members