Account for null (need nullable references enabled).

immense · Jun 22, 2023 · 0630b2e · 0630b2e
1 parent 4fd3193
commit 0630b2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Server/Hubs/CircuitConnection.cs b/Server/Hubs/CircuitConnection.cs
@@ -600,7 +600,7 @@ private async Task SendWakeCommand(Device deviceToWake, IEnumerable<Device> peer
         {
             foreach (var peerDevice in peerDevices)
             {
-                foreach (var mac in deviceToWake.MacAddresses)
+                foreach (var mac in deviceToWake.MacAddresses ?? Array.Empty<string>())
                 {
                     if (_serviceSessionCache.TryGetConnectionId(peerDevice.ID, out var connectionId))
                     {

diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
@@ -347,7 +347,7 @@ public async Task<Result<Device>> AddOrUpdateDevice(Device device)
                 resultDevice.TotalMemory = device.TotalMemory;
                 resultDevice.TotalStorage = device.TotalStorage;
                 resultDevice.AgentVersion = device.AgentVersion;
-                resultDevice.MacAddresses = device.MacAddresses;
+                resultDevice.MacAddresses = device.MacAddresses ?? Array.Empty<string>();
                 resultDevice.LastOnline = DateTimeOffset.Now;
             }
             else