Changeset 6994 for trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients

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/ServiceClients

Files:

• ExecutorMessageContainer.cs (deleted)
• JobData.cs (modified) (1 diff)
• PluginData.cs (modified) (1 diff)
• Task.cs (modified) (1 diff)

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

@@ -29 +29 @@
     protected TaskData(TaskData original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
-      if (original.Data != null) this.Data = new byte[original.Data.Length]; Array.Copy(original.Data, this.Data, original.Data.Length);
+      if (original.Data != null) {
+        this.Data = new byte[original.Data.Length];
+        Array.Copy(original.Data, this.Data, original.Data.Length);
+      }
       this.LastUpdate = original.LastUpdate;
     }

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

@@ -31 +31 @@
     protected PluginData(PluginData original, Cloner cloner)
       : base(original, cloner) {
-      if (original.Data != null)
+      if (original.Data != null) {
         this.Data = new byte[original.Data.Length];
-      Array.Copy(original.Data, this.Data, original.Data.Length);
+        Array.Copy(original.Data, this.Data, original.Data.Length);
+      }
       this.FileName = original.FileName;
       this.PluginId = original.PluginId;

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

@@ -34 +34 @@
       this.CoresNeeded = original.CoresNeeded;
       this.MemoryNeeded = original.MemoryNeeded;
-      this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
+      if (original.PluginsNeededIds != null) {
+        this.PluginsNeededIds = new List<Guid>(original.PluginsNeededIds);
+      }
       this.LastHeartbeat = original.LastHeartbeat;
       this.IsParentTask = original.IsParentTask;