Index: trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/ExecutorMessageContainer.cs
===================================================================
--- trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/ExecutorMessageContainer.cs	(revision 6977)
+++ 	(revision )
@@ -1,59 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-
-namespace HeuristicLab.Clients.Hive {
-  /// <summary>
-  /// This class is used to communicate from the executor to the core, e.g. 
-  /// if the appdomain should be killed
-  /// </summary>
-  [StorableClass]
-  [Serializable]
-  public class ExecutorMessageContainer<CallbackParameterType> : MessageContainer {
-
-    [Storable]
-    public Action<CallbackParameterType> Callback;
-    public CallbackParameterType CallbackParameter;
-
-    public ExecutorMessageContainer() : base() { }
-
-    public ExecutorMessageContainer(MessageType message, Guid parentJobId, Action<CallbackParameterType> callback)
-      : base(message, parentJobId) {
-      this.Callback = callback;
-    }
-
-    protected ExecutorMessageContainer(ExecutorMessageContainer<CallbackParameterType> original, Cloner cloner)
-      : base(original, cloner) {
-      this.Callback = original.Callback;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new ExecutorMessageContainer<CallbackParameterType>(this, cloner);
-    }
-
-    public void execute() {
-      Callback(CallbackParameter);
-    }
-  }
-}
Index: trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs
===================================================================
--- trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs	(revision 6977)
+++ trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs	(revision 6994)
@@ -29,5 +29,8 @@
     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;
     }
Index: trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs
===================================================================
--- trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs	(revision 6977)
+++ trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/PluginData.cs	(revision 6994)
@@ -31,7 +31,8 @@
     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;
Index: trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs
===================================================================
--- trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs	(revision 6977)
+++ trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs	(revision 6994)
@@ -34,5 +34,7 @@
       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;
