Skip to content

Fix check for missing service registration to throw InvalidOperationException instead of NullReferenceException. #29

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

Merged
tillig merged 3 commits into from
Jul 13, 2022
Merged

Fix check for missing service registration to throw InvalidOperationException instead of NullReferenceException. #29

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
91f26a8
add unit test
JarkoDubbeldam Jul 11, 2022
135bdb5
add check for equality to the default value of the ServiceRegistratio…
JarkoDubbeldam Jul 12, 2022
800de9c
added clarifying comment to unittest
JarkoDubbeldam Jul 12, 2022
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
2 changes: 1 addition & 1 deletion src/Autofac.Integration.Wcf/DefaultServiceImplementationDataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public virtual ServiceImplementationData GetServiceImplementationData(string val
}
}

if (serviceRegistration == null)
if (serviceRegistration == null || serviceRegistration == default)
{
throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, AutofacHostFactoryResources.ServiceNotRegistered, value));
}
Expand Down
14 changes: 13 additions & 1 deletion test/Autofac.Integration.Wcf.Test/AutofacHostFactoryFixtureBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,18 @@ public void DetectsUnknownImplementationTypes()
});
}

[Fact]
public void DetectsUnknownServiceTypes()
{
var builder = new ContainerBuilder();
// No service registered at all.
TestWithHostedContainer(builder.Build(), () =>
{
var factory = new T();
Assert.Throws<InvalidOperationException>(() => factory.CreateServiceHost("service", _dummyEndpoints));
});
}

[Fact]
public void ExecutesHostConfigurationActionWhenSet()
{
Expand Down Expand Up @@ -169,4 +181,4 @@ private static void TestWithHostedContainer(IContainer container, Action test)
}
}
}
}
}