Changeset 1036

Timestamp:

12/18/08 17:16:21 (16 years ago)

Author:

kgrading

Message:

bugfix for #401

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/WcfService.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

@@ -67 +67 @@
       Connect();
       if (oldIp != serverIP || oldPort != ServerPort)
-        ServerChanged(this, new EventArgs());
+        if(ServerChanged != null) 
+          ServerChanged(this, new EventArgs());
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -67 +67 @@
 
       wcfService = WcfService.Instance;
+      wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
+      wcfService.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(wcfService_PullJobCompleted);
+      wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
+      wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
+      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
+
       ConnectionContainer cc = ConfigManager.Instance.GetServerIPAndPort();
       if (cc.IPAdress != String.Empty && cc.Port != 0) {
         wcfService.Connect(cc.IPAdress, cc.Port);
       }
-
-      wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
-      wcfService.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(wcfService_PullJobCompleted);
-      wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);      
-      wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
-      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
-       
+   
       Heartbeat beat = new Heartbeat { Interval = 10000 };
       beat.StartHeartbeat();