From 3d3ec3588b523bd6f47795886ef9bdaebc850f95 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Thu, 13 Dec 2018 18:40:51 +0100 Subject: [PATCH] Mark where ILogger is being set to null --- Emby.Dlna/Didl/DidlBuilder.cs | 6 +++--- Emby.Dlna/PlayTo/PlayToController.cs | 2 +- .../Emby.Server.Implementations.csproj | 4 ++-- Emby.Server.Implementations/Services/ServiceHandler.cs | 2 +- MediaBrowser.Controller/Providers/DirectoryService.cs | 2 +- MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs | 2 +- SocketHttpListener/Net/HttpListener.cs | 1 + 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs index 22845586f3..7ed249f4d0 100644 --- a/Emby.Dlna/Didl/DidlBuilder.cs +++ b/Emby.Dlna/Didl/DidlBuilder.cs @@ -180,7 +180,7 @@ namespace Emby.Dlna.Didl return _logger; } - return null; + return null; // TODO: @bond NullLogger } private string GetMimeType(string input) @@ -925,7 +925,7 @@ namespace Emby.Dlna.Didl } catch (XmlException) { - _logger?.LogError("Error adding xml value: {value}", name); + _logger.LogError("Error adding xml value: {value}", name); } } @@ -937,7 +937,7 @@ namespace Emby.Dlna.Didl } catch (XmlException) { - _logger?.LogError("Error adding xml value: {value}", value); + _logger.LogError("Error adding xml value: {value}", value); } } diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs index 272f2e1276..600c8ae50f 100644 --- a/Emby.Dlna/PlayTo/PlayToController.cs +++ b/Emby.Dlna/PlayTo/PlayToController.cs @@ -539,7 +539,7 @@ namespace Emby.Dlna.PlayTo return _logger; } - return null; + return null; // TODO: @bond NullLogger } private PlaylistItem GetPlaylistItem(BaseItem item, List mediaSources, DeviceProfile profile, string deviceId, string mediaSourceId, int? audioStreamIndex, int? subtitleStreamIndex) diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index bf459defb2..2415050198 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -38,7 +38,7 @@ false - + @@ -46,6 +46,6 @@ - + diff --git a/Emby.Server.Implementations/Services/ServiceHandler.cs b/Emby.Server.Implementations/Services/ServiceHandler.cs index 50965b4a97..0f9be1e648 100644 --- a/Emby.Server.Implementations/Services/ServiceHandler.cs +++ b/Emby.Server.Implementations/Services/ServiceHandler.cs @@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.Services if (this.RestPath == null) { string contentType; - // TODO: change null out + // TODO: @bond NullLogger this.RestPath = FindMatchingRestPath(httpMethod, pathInfo, null, out contentType); if (contentType != null) diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs index 2d97e0b887..95f1e1c6cc 100644 --- a/MediaBrowser.Controller/Providers/DirectoryService.cs +++ b/MediaBrowser.Controller/Providers/DirectoryService.cs @@ -27,7 +27,7 @@ namespace MediaBrowser.Controller.Providers } public DirectoryService(IFileSystem fileSystem) - : this(null, fileSystem) // TODO change + : this(null, fileSystem) // TODO: @bond NullLogger { } diff --git a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs index 6e217ab4a5..b8d4a92c12 100644 --- a/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs +++ b/MediaBrowser.Controller/Providers/MetadataRefreshOptions.cs @@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Providers public bool EnableRemoteContentProbe { get; set; } public MetadataRefreshOptions(IFileSystem fileSystem) - : this(new DirectoryService(null, fileSystem)) // TODO + : this(new DirectoryService(null, fileSystem)) // TODO: @bond NullLogger { } diff --git a/SocketHttpListener/Net/HttpListener.cs b/SocketHttpListener/Net/HttpListener.cs index fffecae633..3b21387e00 100644 --- a/SocketHttpListener/Net/HttpListener.cs +++ b/SocketHttpListener/Net/HttpListener.cs @@ -58,6 +58,7 @@ namespace SocketHttpListener.Net auth_schemes = AuthenticationSchemes.Anonymous; } + // TODO: @bond NullLogger public HttpListener(X509Certificate certificate, ICryptoProvider cryptoProvider, ISocketFactory socketFactory, INetworkManager networkManager, ITextEncoding textEncoding, IStreamHelper streamHelper, IFileSystem fileSystem, IEnvironmentInfo environmentInfo) :this(null, certificate, cryptoProvider, socketFactory, networkManager, textEncoding, streamHelper, fileSystem, environmentInfo) {