Changeset 970 for trunk/sources

Timestamp:

12/11/08 16:41:05 (16 years ago)

Author:

msteinbi

Message:

Implementation of ClientCommunicator, heartbet and pulljob (#399)

File:

• trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -16 +16 @@
   /// </summary>
   public class ClientCommunicator: IClientCommunicator {
-    LinkedList<long> jobs;
     int nrOfJobs = 1;
 
     IClientAdapter clientAdapter;
+    IJobAdapter jobAdapter;
 
     public ClientCommunicator() {
-      clientAdapter = ServiceLocator.GetClientAdapter(); 
+      clientAdapter = ServiceLocator.GetClientAdapter();
+      jobAdapter = ServiceLocator.GetJobAdapter();
 
-      jobs = new LinkedList<long>();
-      for (long i = 0; i < nrOfJobs; i++) {
-        jobs.AddFirst(i);
-      }
     }
 
@@ -59 +56 @@
       response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_HARDBEAT_RECEIVED;
       response.ActionRequest = new List<MessageContainer>();
-      if (jobs.Count > 0) 
+      List<Job> allJobs = new List<Job>(jobAdapter.GetAllJobs());
+      if (allJobs.Count > 0) 
         response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.FetchJob));
       else
@@ -70 +68 @@
       ResponseJob response = new ResponseJob();
       lock (this) {
-        if (jobs.Last != null) {
-          response.JobId = jobs.Last.Value;
-          jobs.RemoveLast();
+        LinkedList<Job> allJobs = new LinkedList<Job>(jobAdapter.GetAllJobs());
+        if (allJobs.Last != null) {
+          response.JobId = allJobs.Last.Value.JobId;
+          jobAdapter.DeleteJob(allJobs.Last.Value);   
           response.SerializedJob = PersistenceManager.SaveToGZip(new TestJob());
           response.Success = true;