Changeset 9347

Timestamp:

04/09/13 16:39:36 (12 years ago)

Author:

ascheibe

Message:

#1890 fixed 2 slave bugs:

• catch the exception that is thrown if the slave communication service has already been started
• fixed closing of the wait handle in the heartbeat manager

Location:

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3

Files:

• Core.cs (modified) (1 diff)
• Manager/HeartbeatManager.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -75 +75 @@
         //start the client communication service (pipe between slave and slave gui)
         slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
-        slaveComm.Open();
+
+        try {
+          slaveComm.Open();
+        }
+        catch (AddressAlreadyInUseException ex) {
+          if (ServiceEventLog != null) {
+            EventLogManager.LogException(ex);
+          }
+        }
 
         // delete all left over task directories

trunk/sources/HeuristicLab.Clients.Hive.Slave/3.3/Manager/HeartbeatManager.cs

@@ -70 +70 @@
       waitHandle.Set();
       heartBeatThread.Join();
+      waitHandle.Close();
     }
 
@@ -129 +130 @@
         waitHandle.WaitOne(this.interval);
       }
-      waitHandle.Close();
       SlaveClientCom.Instance.LogMessage("Heartbeat thread stopped");
     }