diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-05-22 22:01:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 22:01:03 +0100 |
| commit | 51fb6e1d2d4ed30ead48400e71706a609547937e (patch) | |
| tree | 18e42025cf00afb98444f36215d6a9a9ed8b15aa /MediaBrowser.Common/Net | |
| parent | d0537a3271ca9294dce1e86af290e2109ba5e15f (diff) | |
| parent | db9d3b8653d865459e5df5a2fba18f0c9462dbb6 (diff) | |
Merge branch 'master' into IsRoot_fix
Diffstat (limited to 'MediaBrowser.Common/Net')
| -rw-r--r-- | MediaBrowser.Common/Net/INetworkManager.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/IPHost.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/IPNetAddress.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/IPObject.cs | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs index 185df5b773..b939397301 100644 --- a/MediaBrowser.Common/Net/INetworkManager.cs +++ b/MediaBrowser.Common/Net/INetworkManager.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/MediaBrowser.Common/Net/IPHost.cs b/MediaBrowser.Common/Net/IPHost.cs index fb3ef9b12b..5db8817ee6 100644 --- a/MediaBrowser.Common/Net/IPHost.cs +++ b/MediaBrowser.Common/Net/IPHost.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Diagnostics; using System.Linq; @@ -400,10 +399,7 @@ namespace MediaBrowser.Common.Net private bool ResolveHost() { // When was the last time we resolved? - if (_lastResolved == null) - { - _lastResolved = DateTime.UtcNow; - } + _lastResolved ??= DateTime.UtcNow; // If we haven't resolved before, or our timer has run out... if ((_addresses.Length == 0 && !Resolved) || (DateTime.UtcNow > _lastResolved.Value.AddMinutes(Timeout))) diff --git a/MediaBrowser.Common/Net/IPNetAddress.cs b/MediaBrowser.Common/Net/IPNetAddress.cs index 589aad4b09..f6e3971bf3 100644 --- a/MediaBrowser.Common/Net/IPNetAddress.cs +++ b/MediaBrowser.Common/Net/IPNetAddress.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Net; using System.Net.Sockets; diff --git a/MediaBrowser.Common/Net/IPObject.cs b/MediaBrowser.Common/Net/IPObject.cs index 3542dcd75e..2612268fd8 100644 --- a/MediaBrowser.Common/Net/IPObject.cs +++ b/MediaBrowser.Common/Net/IPObject.cs @@ -1,4 +1,3 @@ -#nullable enable using System; using System.Net; using System.Net.Sockets; |