yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some of the build errors after merge

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-03-17 09:14:12 +01:00
parent 214bcceffc
commit 34471e35ce
25 changed files with 99 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Infrastructure/DistributedLocking/DefaultDistributedLockingMechanismFactory.cs
View File

@@ -12,7 +12,7 @@ public class DefaultDistributedLockingMechanismFactory : IDistributedLockingMech
{
private object _lock = new();
private bool _initialized;
private IDistributedLockingMechanism _distributedLockingMechanism;
private IDistributedLockingMechanism? _distributedLockingMechanism;
private readonly IOptionsMonitor<GlobalSettings> _globalSettings;
private readonly IEnumerable<IDistributedLockingMechanism> _distributedLockingMechanisms;
@@ -25,7 +25,7 @@ public class DefaultDistributedLockingMechanismFactory : IDistributedLockingMech
_distributedLockingMechanisms = distributedLockingMechanisms;
}
public IDistributedLockingMechanism DistributedLockingMechanism
public IDistributedLockingMechanism? DistributedLockingMechanism
{
get
{
@@ -44,7 +44,7 @@ public class DefaultDistributedLockingMechanismFactory : IDistributedLockingMech
if (!string.IsNullOrEmpty(configured))
{
IDistributedLockingMechanism value = _distributedLockingMechanisms
IDistributedLockingMechanism? value = _distributedLockingMechanisms
.FirstOrDefault(x => x.GetType().FullName?.EndsWith(configured) ?? false);
if (value == null)
@@ -53,7 +53,7 @@ public class DefaultDistributedLockingMechanismFactory : IDistributedLockingMech
}
}
IDistributedLockingMechanism defaultMechanism = _distributedLockingMechanisms.FirstOrDefault(x => x.Enabled);
IDistributedLockingMechanism? defaultMechanism = _distributedLockingMechanisms.FirstOrDefault(x => x.Enabled);
if (defaultMechanism != null)
{
return defaultMechanism;