Changeset 5588 for branches

Timestamp:

03/02/11 10:17:53 (14 years ago)

Author:

cneumuel

Message:

#1260

• fixed compatibility issue
• updated hive binaries

Location:

branches/HeuristicLab.Hive-3.3

Files:

• binaries/HeuristicLab.Hive.ExperimentManager.zip (modified) (previous)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs (modified) (2 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/LogServiceReader.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs

@@ -22 +22 @@
 using System;
 using System.ServiceModel;
+using HeuristicLab.Clients.Common;
 using HeuristicLab.Common;
-using HeuristicLab.Hive.Tracing;
-using HeuristicLab.Clients.Common;
-using HeuristicLab.Hive.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Contracts {
@@ -63 +61 @@
       try {
         if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(password)) {
-          return ClientFactory.CreateClient<T>(endpointName, hostAddress, userName, password);
+          var factory = ClientFactory.CreateChannelFactory<T>(endpointName, hostAddress, userName, password);
+          return new Disposable<T>(factory.Obj.CreateChannel());
         } else {
-          return ClientFactory.CreateClient<T>(endpointName, hostAddress);
+          var factory = ClientFactory.CreateChannelFactory<T>(endpointName, hostAddress);
+          return new Disposable<T>(factory.Obj.CreateChannel());     
         }
       }

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/LogServiceReader.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using HeuristicLab.Core;
+using HeuristicLab.Clients.Common;
 using HeuristicLab.Hive.Slave.Console.SlaveConsoleService;
-using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Hive.Slave.Console {
@@ -24 +22 @@
     }
 
-    void timer_Tick(object sender, EventArgs e) {
+    private void timer_Tick(object sender, EventArgs e) {
       try {
-        using (var slaveClient = ClientFactory.CreateClient<ISlaveConsoleCommunicator>("SlaveConsoleTcpEndpointClient")) {
+        using (var factory = ClientFactory.CreateChannelFactory<ISlaveConsoleCommunicator>("SlaveConsoleTcpEndpointClient")) {
+          var slaveClient = factory.Obj.CreateChannel();
           try {
-            var messages = slaveClient.Obj.GetLogMessages();
+            var messages = slaveClient.GetLogMessages();
             if (messages.Count < messageCount) {
               messageCount = 0; // log got cleared