Changeset 5707 for branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.HiveEngine

Timestamp:

03/16/11 13:31:37 (14 years ago)

Author:

cneumuel

Message:

#1260

• some changes due to the removal of Disposable (r5706)
• copy PluginInfrastructure files into PluginCache folder in slaves (needed due to r5703)

File:

• branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (5 diffs)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Hive.Contracts;
+using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts.Interfaces;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
+using HeuristicLab.Hive.ExperimentManager;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
-using HeuristicLab.Common;
-using HeuristicLab.Hive.Contracts.Interfaces;
-using HeuristicLab.Clients.Common;
-using HeuristicLab.Hive.ExperimentManager;
-using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Hive.Contracts.ResponseObjects;
-using System.Threading;
-using HeuristicLab.Random;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.HiveEngine {
@@ -245 +243 @@
           Thread.Sleep(10000);
           try {
-            using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
+            using (DisposableWrapper<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
               results = service.Obj.GetJobResults(remainingJobIds).Obj;
             }
@@ -312 +310 @@
         TryAndRepeat(() => {
           LogMessage(string.Format("Deleting {0} jobs on hive.", jobIndices.Count));
-          using (Disposable<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
+          using (DisposableWrapper<IClientFacade> service = ServiceLocator.Instance.ClientFacadePool.GetService()) {
             foreach (Guid jobId in jobIndices.Keys) {
               service.Obj.DeleteJob(jobId);
@@ -359 +357 @@
             cancellationToken.ThrowIfCancellationRequested();
             try {
-              using (Disposable<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
+              using (DisposableWrapper<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
                 response = service.Obj.AddJobWithGroupStrings(serializedJob, groups);
                 serializedJob = null;
@@ -390 +388 @@
           cancellationToken.ThrowIfCancellationRequested();
           try {
-            using (Disposable<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
+            using (DisposableWrapper<IClientFacade> service = ServiceLocator.Instance.StreamedClientFacadePool.GetService()) {
               serializedJob = service.Obj.GetLastSerializedResult(jobId).Obj;
             }