Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/14/11 22:44:16 (13 years ago)
Author:
ascheibe
Message:

#1672

  • removed dead code
  • added Hive assembly references to Tests project
  • fixed problems found by tests
Location:
trunk/sources/HeuristicLab.Clients.Hive/3.3
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r6976 r6994  
    144144    <Compile Include="ServiceClients\Slave.cs" />
    145145    <Compile Include="ServiceClients\LightweightTask.cs" />
    146     <Compile Include="ServiceClients\ExecutorMessageContainer.cs" />
    147146    <Compile Include="ServiceClients\MessageContainer.cs" />
    148147    <Compile Include="ServiceClients\HiveServiceClient.cs" />

  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

    r6976 r6994  
    153153
    154154    #region Constructors and Cloning
     155    [StorableConstructor]
     156    protected HiveTask(bool deserializing) { }
     157
    155158    public HiveTask() {
    156159      this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 0 };
    … …  
    515518    #region Constructors and Cloning
    516519    public HiveTask() : base() { }
     520    [StorableConstructor]
     521    protected HiveTask(bool deserializing) { }
    517522    public HiveTask(T itemJob) : base(itemJob, true) { }
    518     protected HiveTask(HiveTask original, Cloner cloner)
     523    protected HiveTask(HiveTask<T> original, Cloner cloner)
    519524      : base(original, cloner) {
    520525    }

  • trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

    r6976 r6994  
    208208    protected RefreshableJob(RefreshableJob original, Cloner cloner) {
    209209      cloner.RegisterClonedObject(original, this);
    210       this.Job = original.Job;
     210      this.Job = cloner.Clone(original.Job);
    211211      this.IsControllable = original.IsControllable;
    212212      this.log = cloner.Clone(original.log);

  • trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs

    r6976 r6994  
    2929    protected TaskData(TaskData original, Cloner cloner) {
    3030      cloner.RegisterClonedObject(original, this);
    31       if (original.Data != null) this.Data = new byte[original.Data.Length]; Array.Copy(original.Data, this.Data, original.Data.Length);
     31      if (original.Data != null) {
     32        this.Data = new byte[original.Data.Length];
     33        Array.Copy(original.Data, this.Data, original.Data.Length);
     34      }
    3235      this.LastUpdate = original.LastUpdate;
    3336    }

  • trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs

    r6976 r6994  
    3131    protected PluginData(PluginData original, Cloner cloner)
    3232      : base(original, cloner) {
    33       if (original.Data != null)
     33      if (original.Data != null) {
    3434        this.Data = new byte[original.Data.Length];
    35       Array.Copy(original.Data, this.Data, original.Data.Length);
     35        Array.Copy(original.Data, this.Data, original.Data.Length);
     36      }
    3637      this.FileName = original.FileName;
    3738      this.PluginId = original.PluginId;

  • trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

    r6976 r6994  
    3434      this.CoresNeeded = original.CoresNeeded;
    3535      this.MemoryNeeded = original.MemoryNeeded;
    36       this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
     36      if (original.PluginsNeededIds != null) {
     37        this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
     38      }
    3739      this.LastHeartbeat = original.LastHeartbeat;
    3840      this.IsParentTask = original.IsParentTask;
Note: See TracChangeset for help on using the changeset viewer.