Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -55 +54 @@
       IEnumerable<Type> usedTypes;
 
-      // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems
-      //lock (locker) {
-        ((IAtomicOperation)ItemTask.InitialOperation).Scope.Parent = parentScopeClone;
-        ItemTask.InitialOperation = (IOperation)ItemTask.InitialOperation.Clone();
-        ((IAtomicOperation)ItemTask.InitialOperation).Scope.ClearParentScopes();
-        jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes);
-      //}
-
-      // add type objects from object graph to work around ticket #1527
-      var typeObjects = ItemTask.GetObjectGraphObjects().OfType<Type>();
-      usedTypes = new List<Type>(usedTypes).Union(typeObjects);
+      // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems      
+      ((IAtomicOperation)ItemTask.InitialOperation).Scope.Parent = parentScopeClone;
+      ItemTask.InitialOperation = (IOperation)ItemTask.InitialOperation.Clone();
+      ((IAtomicOperation)ItemTask.InitialOperation).Scope.ClearParentScopes();
+      jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes);
 
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-      
       return jobData;
     }