Changeset 5599 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/HeartbeatManager.cs

Timestamp:

03/03/11 14:18:29 (13 years ago)

Author:

ascheibe

Message:

#1233

• rename 'Slave' namespace to 'SlaveCore' (and assemblies etc) to avoid problems with 'Slave' class
• use svcutil (OKB-style)

File:

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

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

@@ -24 +24 @@
 using System.Threading;
 using HeuristicLab.Common;
-using HeuristicLab.Services.Hive.Common;
-using HeuristicLab.Services.Hive.Common.DataTransfer;
 
-namespace HeuristicLab.Clients.Hive.Slave {
+namespace HeuristicLab.Clients.Hive.SlaveCore {
   /// <summary>
   /// Heartbeat class. It sends every x ms a heartbeat to the server and receives a Message
@@ -87 +85 @@
             }
             if (wcfService.ConnState == NetworkEnum.WcfConnState.Connected) {
-              HeuristicLab.Services.Hive.Common.DataTransfer.Slave info = ConfigManager.Instance.GetClientInfo();
+              Slave info = ConfigManager.Instance.GetClientInfo();
 
               Heartbeat heartBeatData = new Heartbeat {
@@ -103 +101 @@
                 SlaveClientCom.Instance.ClientCom.LogMessage("Error getting response from Heartbeat");
                 OnExceptionOccured(new Exception("Error getting response from Heartbeat"));
+              } else {
+                SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Response received: ");
+                msgs.ForEach(mc => SlaveClientCom.Instance.ClientCom.LogMessage(mc.Message.ToString()));
+                msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
               }
-
-              SlaveClientCom.Instance.ClientCom.LogMessage("Heartbeat Response received: ");
-              msgs.ForEach(mc => SlaveClientCom.Instance.ClientCom.LogMessage(mc.Message.ToString()));
-              msgs.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
             }
           }