Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs
- Timestamp:
- 12/20/11 13:54:57 (12 years ago)
- Location:
- branches/HeuristicLab.Hive.Azure
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive.Azure
- Property svn:ignore
-
old new 4 4 *.suo 5 5 *.vsp 6 Doxygen 6 7 Google.ProtocolBuffers-0.9.1.dll 7 8 HeuristicLab 3.3.5.1.ReSharper.user 8 9 HeuristicLab 3.3.6.0.ReSharper.user 9 10 HeuristicLab.4.5.resharper.user 11 HeuristicLab.ExtLibs.6.0.ReSharper.user 10 12 HeuristicLab.resharper.user 11 13 ProtoGen.exe … … 16 18 bin 17 19 protoc.exe 18 HeuristicLab.ExtLibs.6.0.ReSharper.user19 Doxygen
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3
- Property svn:ignore
-
old new 1 1 obj 2 2 Plugin.cs 3 bin
-
- Property svn:ignore
-
branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs
r6976 r7215 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq;25 24 using HeuristicLab.Common; 26 25 using HeuristicLab.Core; … … 55 54 IEnumerable<Type> usedTypes; 56 55 57 // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems 58 //lock (locker) { 59 ((IAtomicOperation)ItemTask.InitialOperation).Scope.Parent = parentScopeClone; 60 ItemTask.InitialOperation = (IOperation)ItemTask.InitialOperation.Clone(); 61 ((IAtomicOperation)ItemTask.InitialOperation).Scope.ClearParentScopes(); 62 jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes); 63 //} 64 65 // add type objects from object graph to work around ticket #1527 66 var typeObjects = ItemTask.GetObjectGraphObjects().OfType<Type>(); 67 usedTypes = new List<Type>(usedTypes).Union(typeObjects); 56 // clone operation and remove unnecessary scopes; don't do this earlier to avoid memory problems 57 ((IAtomicOperation)ItemTask.InitialOperation).Scope.Parent = parentScopeClone; 58 ItemTask.InitialOperation = (IOperation)ItemTask.InitialOperation.Clone(); 59 ((IAtomicOperation)ItemTask.InitialOperation).Scope.ClearParentScopes(); 60 jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes); 68 61 69 62 PluginUtil.CollectDeclaringPlugins(plugins, usedTypes); 70 71 63 return jobData; 72 64 }
Note: See TracChangeset
for help on using the changeset viewer.