Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NullReferenceException in background thread emitting IL in Depend… #55340

Merged
merged 3 commits into from
Jul 8, 2021
Merged

Fix NullReferenceException in background thread emitting IL in Depend… #55340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
073582c
Fix NullReferenceException in background thread emitting IL in Depend…
eerhardt Jul 8, 2021
4da7438
add a comment explaining the ordering
eerhardt Jul 8, 2021
7c3ef6c
Add a debug assert that we shouldn't get exceptions from the backgrou…
eerhardt Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...icrosoft.Extensions.DependencyInjection/src/ServiceLookup/DynamicServiceProviderEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;
using System.Threading;

namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
Expand Down Expand Up @@ -37,6 +38,8 @@ public override Func<ServiceProviderEngineScope, object> RealizeService(ServiceC
catch (Exception ex)
{
DependencyInjectionEventSource.Log.ServiceRealizationFailed(ex);
Debug.Fail($"We should never get exceptions from the background compilation.{Environment.NewLine}{ex}");
}
},
null);
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/Microsoft.Extensions.DependencyInjection/src/ServiceProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ public sealed class ServiceProvider : IServiceProvider, IDisposable, IAsyncDispo

internal ServiceProvider(IEnumerable<ServiceDescriptor> serviceDescriptors, ServiceProviderOptions options)
{
// note that Root needs to be set before calling GetEngine(), because the engine may need to access Root
Root = new ServiceProviderEngineScope(this, isRootScope: true);
eerhardt marked this conversation as resolved.
Show resolved Hide resolved
_engine = GetEngine();
_createServiceAccessor = CreateServiceAccessor;
_realizedServices = new ConcurrentDictionary<Type, Func<ServiceProviderEngineScope, object>>();

Root = new ServiceProviderEngineScope(this, isRootScope: true);
CallSiteFactory = new CallSiteFactory(serviceDescriptors);
// The list of built in services that aren't part of the list of service descriptors
// keep this in sync with CallSiteFactory.IsService
Expand Down