Changeset 7142

Timestamp:

12/06/11 19:21:45 (13 years ago)

Author:

ascheibe

Message:

#1672 implemented reviewing comments

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3

Files:

• HeuristicLab.Clients.Hive-3.3.csproj (modified) (1 diff)
• HiveJobs/EngineHiveTask.cs (modified) (2 diffs)
• HiveJobs/OptimizerHiveTask.cs (modified) (2 diffs)
• HiveServiceLocator.cs (modified) (4 diffs)
• JobResultPoller.cs (modified) (2 diffs)
• ServiceClients/TaskData.cs (moved) (moved from trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs)
• Util/PersistenceUtil.cs (modified) (1 diff)

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

@@ -167 +167 @@
     <Compile Include="ServiceClients\Heartbeat.cs" />
     <Compile Include="ServiceClients\HiveItem.cs" />
-    <Compile Include="ServiceClients\JobData.cs" />
+    <Compile Include="ServiceClients\TaskData.cs" />
     <Compile Include="ServiceClients\Plugin.cs" />
     <Compile Include="ServiceClients\PluginData.cs" />

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs

@@ -55 +55 @@
       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);
-      //}
+      // 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);
 
       // add type objects from object graph to work around ticket #1527
@@ -68 +66 @@
 
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-      
+
       return jobData;
     }

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/OptimizerHiveTask.cs

@@ -354 +354 @@
       int idx = run.Name.IndexOf("Run ") + 4;
 
-      if (idx == -1 || runs.Count == 0)
+      if (idx == 3 || runs.Count == 0)
         return run.Name;
 
@@ -371 +371 @@
     private static int GetRunNumber(string runName) {
       int idx = runName.IndexOf("Run ") + 4;
-      if (idx == -1) {
+      if (idx == 3) {
         return 0;
       } else {

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs

@@ -33 +33 @@
         return instance;
       }
-      set {
-        instance = value;
-      }
     }
 
@@ -56 +53 @@
       else
         cl = ClientFactory.CreateClient<HiveServiceClient, IHiveService>(null, null, username, password);
-      
+
       return cl;
     }
@@ -64 +61 @@
       try {
         return call(client);
-      }
-      finally {
+      } finally {
         try {
           client.Close();
@@ -79 +75 @@
       try {
         call(client);
-      }
-      finally {
+      } finally {
         try {
           client.Close();

trunk/sources/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

@@ -27 +27 @@
 namespace HeuristicLab.Clients.Hive {
   public class JobResultPoller {
-    private bool stopRequested { get; set; }
+    private bool stopRequested;
     private AutoResetEvent waitHandle;
     private Thread thread;
@@ -96 +96 @@
         catch (Exception e) {
           OnExceptionOccured(e);
-        }
-        finally {
+        } finally {
           IsPolling = false;
         }

trunk/sources/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs

@@ -29 +29 @@
   public static class PersistenceUtil {
     public static byte[] Serialize(object obj, out IEnumerable<Type> types) {
-      MemoryStream memStream = new MemoryStream();
-      XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-      byte[] jobByteArray = memStream.ToArray();
-      memStream.Dispose();
-      return jobByteArray;
+      using (MemoryStream memStream = new MemoryStream()) {
+        XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
+        byte[] jobByteArray = memStream.ToArray();
+        return jobByteArray;
+      }
     }
 
     public static byte[] Serialize(object obj) {
-      MemoryStream memStream = new MemoryStream();
-      XmlGenerator.Serialize(obj, memStream);
-      byte[] jobByteArray = memStream.ToArray();
-      memStream.Dispose();
-      return jobByteArray;
+      using (MemoryStream memStream = new MemoryStream()) {
+        XmlGenerator.Serialize(obj, memStream);
+        byte[] jobByteArray = memStream.ToArray();
+        return jobByteArray;
+      }
     }
 
     public static T Deserialize<T>(byte[] sjob) {
-      MemoryStream memStream = new MemoryStream(sjob);
-      T job = XmlParser.Deserialize<T>(memStream);
-      memStream.Dispose();
-      return job;
+      using (MemoryStream memStream = new MemoryStream(sjob)) {
+        T job = XmlParser.Deserialize<T>(memStream);
+        return job;
+      }
     }
   }