Changeset 1081

Timestamp:

01/07/09 15:31:58 (16 years ago)

Author:

kgrading

Message:

login bugfixing for (#401)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/WcfService.cs (modified) (3 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (2 diffs)

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

@@ -28 +28 @@
 
     public event EventHandler ConnectionRestored;    
-    public event EventHandler ServerChanged;    
+    public event EventHandler ServerChanged;
+    public event EventHandler Connected;    
 
     public ClientCommunicatorClient proxy = null;
@@ -37 +38 @@
     public void Connect() {
       try {
-        proxy = null;
-        if (proxy == null) {
-          proxy = new ClientCommunicatorClient(
-            new NetTcpBinding(),
-            new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator")
-            );
-        }
+        proxy = new ClientCommunicatorClient(
+          new NetTcpBinding(),
+          new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator")
+        );
 
         proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
@@ -49 +47 @@
         proxy.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(proxy_SendJobResultCompleted);
         proxy.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(proxy_SendHeartBeatCompleted);
-
+        proxy.Open();        
+        if (Connected != null)
+          Connected(this, new EventArgs());           
         if (ConnState == NetworkEnum.WcfConnState.Failed)
           ConnectionRestored(this, new EventArgs());

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

@@ -72 +72 @@
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
       wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
-
+      wcfService.Connected += new EventHandler(wcfService_Connected);
       ConnectionContainer cc = ConfigManager.Instance.GetServerIPAndPort();
       if (cc.IPAdress != String.Empty && cc.Port != 0) {
@@ -189 +189 @@
 
     void wcfService_ServerChanged(object sender, EventArgs e) {
-      foreach(KeyValuePair<long, AppDomain> entries in appDomains)
-        AppDomain.Unload(appDomains[entries.Key]);
-      appDomains = new Dictionary<long, AppDomain>();
-      engines = new Dictionary<long, Executor>();
+      lock (Locker) {
+        foreach (KeyValuePair<long, AppDomain> entries in appDomains)
+          AppDomain.Unload(appDomains[entries.Key]);
+        appDomains = new Dictionary<long, AppDomain>();
+        engines = new Dictionary<long, Executor>();
+      }
+    }
+
+    void wcfService_Connected(object sender, EventArgs e) {
       wcfService.LoginAsync(ConfigManager.Instance.GetClientInfo());
     }