Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5588 for branches


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/WcfServicePool.cs

    r5153 r5588  
    2222using System;
    2323using System.ServiceModel;
     24using HeuristicLab.Clients.Common;
    2425using HeuristicLab.Common;
    25 using HeuristicLab.Hive.Tracing;
    26 using HeuristicLab.Clients.Common;
    27 using HeuristicLab.Hive.Contracts.Interfaces;
    2826
    2927namespace HeuristicLab.Hive.Contracts {
     
    6361      try {
    6462        if (!string.IsNullOrEmpty(userName) && !string.IsNullOrEmpty(password)) {
    65           return ClientFactory.CreateClient<T>(endpointName, hostAddress, userName, password);
     63          var factory = ClientFactory.CreateChannelFactory<T>(endpointName, hostAddress, userName, password);
     64          return new Disposable<T>(factory.Obj.CreateChannel());
    6665        } else {
    67           return ClientFactory.CreateClient<T>(endpointName, hostAddress);
     66          var factory = ClientFactory.CreateChannelFactory<T>(endpointName, hostAddress);
     67          return new Disposable<T>(factory.Obj.CreateChannel());     
    6868        }
    6969      }
  • branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/LogServiceReader.cs

    r5093 r5588  
    22using System.Collections.Generic;
    33using System.Linq;
    4 using System.Text;
    54using System.Windows.Forms;
    6 using HeuristicLab.Core;
     5using HeuristicLab.Clients.Common;
    76using HeuristicLab.Hive.Slave.Console.SlaveConsoleService;
    8 using HeuristicLab.Clients.Common;
    97
    108namespace HeuristicLab.Hive.Slave.Console {
     
    2422    }
    2523
    26     void timer_Tick(object sender, EventArgs e) {
     24    private void timer_Tick(object sender, EventArgs e) {
    2725      try {
    28         using (var slaveClient = ClientFactory.CreateClient<ISlaveConsoleCommunicator>("SlaveConsoleTcpEndpointClient")) {
     26        using (var factory = ClientFactory.CreateChannelFactory<ISlaveConsoleCommunicator>("SlaveConsoleTcpEndpointClient")) {
     27          var slaveClient = factory.Obj.CreateChannel();
    2928          try {
    30             var messages = slaveClient.Obj.GetLogMessages();
     29            var messages = slaveClient.GetLogMessages();
    3130            if (messages.Count < messageCount) {
    3231              messageCount = 0; // log got cleared
Note: See TracChangeset for help on using the changeset viewer.