Changeset 2086 for trunk/sources/HeuristicLab.Hive.Server.Core

Timestamp:

06/23/09 13:45:51 (15 years ago)

Author:

svonolfe

Message:

Further improved handling of job objects (#372)

Location:

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

Files:

• ClientManager.cs (modified) (1 diff)
• JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs

@@ -232 +232 @@
 
         ClientInfo client = clientAdapter.GetById(resourceId);
-        List<ClientGroup> groupsOfClient = new List<ClientGroup>(clientGroupAdapter.MemberOf(client));
-        response.Obj = groupsOfClient;
-        response.Success = true;
-        response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT;
+        if (client != null) {
+          List<ClientGroup> groupsOfClient = new List<ClientGroup>(clientGroupAdapter.MemberOf(client));
+          response.Obj = groupsOfClient;
+          response.Success = true;
+          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_GET_GROUPS_OF_CLIENT;
+        } else {
+          response.Obj = new List<ClientGroup>();
+          response.Success = false;
+          response.StatusMessage = ApplicationConstants.RESPONSE_CLIENT_RESOURCE_NOT_FOUND;
+        }
 
         return response;

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/JobManager.cs

@@ -55 +55 @@
             session.GetDataAdapter<JobResult, IJobResultsAdapter>();
 
-        List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
-        JobResult lastJobResult = null;
-        foreach (JobResult jR in allJobResults) {
-          // if lastJobResult was before the current jobResult the lastJobResult must be updated
-          if (lastJobResult == null ||
-              (jR.Timestamp > lastJobResult.Timestamp))
-            lastJobResult = jR;
-        }
-        return lastJobResult;
+        return jobResultAdapter.GetLastResultOf(job);
       }
       finally {