Changeset 3220 for trunk/sources/HeuristicLab.Hive.Client.Core/3.2

Timestamp:

03/25/10 19:57:44 (14 years ago)

Author:

kgrading

Message:

improved the DAL further, changed minor details for the presentation (#830)

Location:

trunk/sources/HeuristicLab.Hive.Client.Core/3.2

Files:

• ConfigurationManager/UptimeManager.cs (modified) (1 diff)
• Core.cs (modified) (1 diff)
• JobStorage/JobStorageManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/ConfigurationManager/UptimeManager.cs

@@ -33 +33 @@
         return instance;
       }
+    }
+
+    public UptimeManager() {
+      RestoreFromHDD();
     }
 

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/Core.cs

@@ -311 +311 @@
     /// <param name="e"></param>
     void wcfService_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
-      Logging.Instance.Info(this.ToString(), "Received new job with id " + e.Result.Job.Id);
-      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {        
+      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
+        Logging.Instance.Info(this.ToString(), "Received new job with id " + e.Result.Job.Id);      
         bool sandboxed = false;
         List<byte[]> files = new List<byte[]>();

trunk/sources/HeuristicLab.Hive.Client.Core/3.2/JobStorage/JobStorageManager.cs

@@ -63 +63 @@
             Logging.Instance.Error("JobStorageManager", "Job not on hdd but on list - deleting job from list", e);
             storedJobsList.Remove(storedJobsList[index - 1]);
+            StoreJobList();
           }
       
@@ -82 +83 @@
             
       XmlSerializer serializer = new XmlSerializer(typeof(List<JobStorageInfo>));
+      FileStream stream = null;
       if(File.Exists(Path.Combine(path ,"list.xml"))) {
         try {
-          FileStream stream = new FileStream(Path.Combine(path, "list.xml"), FileMode.Open);
+          stream = new FileStream(Path.Combine(path, "list.xml"), FileMode.Open);
           XmlTextReader reader = new XmlTextReader(stream);
           storedJobsList = (List<JobStorageInfo>)serializer.Deserialize(reader);
@@ -91 +93 @@
         catch (Exception e) {
           Logging.Instance.Error("JobStorageManager", "Exception while loading the Stored Job List", e);
+        } finally {
+          if(stream != null) 
+            stream.Dispose();
         }
       } else {