Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 13 insertions, 18 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 733574f72..2dfea3ff3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -35,6 +35,8 @@ using Tango.PPC.Common.ExternalBridge;
 using Tango.Integration.ExternalBridge;
 using Tango.BL.DTO;
 using Tango.PPC.Shared.Updates;
+using Tango.PPC.Shared.RemoteUpgrade;
+using Tango.Core.Threading;
 
 namespace Tango.PPC.Common.MachineUpdate
 {
@@ -1687,30 +1689,23 @@ namespace Tango.PPC.Common.MachineUpdate
 
         public void OnReceiverDisconnected(ExternalBridgeReceiver receiver)
         {
-
+            //Do nothing.
         }
 
-        [ExternalBridgeRequestHandlerMethod(typeof(GetUpdatesAndPackagesRequest))]
-        public async void OnGetUpdatesAndPackagesRequest(GetUpdatesAndPackagesRequest request, String token, ExternalBridgeReceiver receiver)
+        [ExternalBridgeRequestHandlerMethod(typeof(GetUpdatesAndPackagesRequest), RequestHandlerLoggingMode.LogRequestName)]
+        public async Task OnGetUpdatesAndPackagesRequest(GetUpdatesAndPackagesRequest request, String token, ExternalBridgeReceiver receiver)
         {
-            try
+            using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                using (ObservablesContext db = ObservablesContext.CreateDefault())
-                {
-                    var updates = await db.TangoUpdates.OrderByDescending(x => x.StartDate).ToListAsync();
-                    var updatesDTO = updates.Select(x => TangoUpdateDTO.FromObservable(x)).ToList();
-                    var packages = (await _packageRunner.GetPackagesFile()).PackageInstallations;
+                var updates = await db.TangoUpdates.OrderByDescending(x => x.StartDate).ToListAsync();
+                var updatesDTO = updates.Select(x => TangoUpdateDTO.FromObservable(x)).ToList();
+                var packages = (await _packageRunner.GetPackagesFile()).PackageInstallations;
 
-                    var response = new GetUpdatesAndPackagesResponse();
-                    response.Updates.AddRange(updatesDTO);
-                    response.Packages.AddRange(packages);
+                var response = new GetUpdatesAndPackagesResponse();
+                response.Updates.AddRange(updatesDTO);
+                response.Packages.AddRange(packages);
 
-                    await receiver.SendGenericResponse(response, token);
-                }
-            }
-            catch (Exception ex)
-            {
-                await receiver.SendErrorResponse(ex, token);
+                await receiver.SendGenericResponse(response, token);
             }
         }