Use null coalescing when possible

This commit is contained in:
crobibero
2020-11-13 11:24:46 -07:00
parent 5f52a58e78
commit 95ebb9a55a
13 changed files with 22 additions and 110 deletions

View File

@@ -50,11 +50,7 @@ namespace Emby.Server.Implementations.AppBase
// If the file didn't exist before, or if something has changed, re-save
if (buffer == null || !newBytes.AsSpan(0, newBytesLen).SequenceEqual(buffer))
{
var directory = Path.GetDirectoryName(path);
if (directory == null)
{
throw new ResourceNotFoundException(nameof(directory));
}
var directory = Path.GetDirectoryName(path) ?? throw new ResourceNotFoundException(nameof(path));
Directory.CreateDirectory(directory);
// Save it after load in case we got new items

View File

@@ -81,12 +81,7 @@ namespace Emby.Server.Implementations.Cryptography
throw new CryptographicException($"Requested hash method is not supported: {hashMethod}");
}
using var h = HashAlgorithm.Create(hashMethod);
if (h == null)
{
throw new ResourceNotFoundException(nameof(h));
}
using var h = HashAlgorithm.Create(hashMethod) ?? throw new ResourceNotFoundException(nameof(hashMethod));
if (salt.Length == 0)
{
return h.ComputeHash(bytes);

View File

@@ -58,12 +58,7 @@ namespace Emby.Server.Implementations.Session
private void OnConnectionClosed(object? sender, EventArgs e)
{
if (sender == null)
{
throw new ResourceNotFoundException(nameof(sender));
}
var connection = (IWebSocketConnection)sender;
var connection = sender as IWebSocketConnection ?? throw new ResourceNotFoundException(nameof(sender));
_logger.LogDebug("Removing websocket from session {Session}", _session.Id);
_sockets.Remove(connection);
connection.Closed -= OnConnectionClosed;