Skip to content
This repository was archived by the owner on Nov 8, 2021. It is now read-only.

Commit 775628e

Browse files
committed
Simplify null checks
1 parent 1de9659 commit 775628e

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

Unity.Wcf/UnityContractBehavior.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.ServiceModel.Channels;
33
using System.ServiceModel.Description;
44
using System.ServiceModel.Dispatcher;
@@ -11,12 +11,7 @@ public class UnityContractBehavior : IContractBehavior
1111

1212
public UnityContractBehavior(IInstanceProvider instanceProvider)
1313
{
14-
if (instanceProvider == null)
15-
{
16-
throw new ArgumentNullException("instanceProvider");
17-
}
18-
19-
_instanceProvider = instanceProvider;
14+
_instanceProvider = instanceProvider ?? throw new ArgumentNullException("instanceProvider");
2015
}
2116

2217
public void AddBindingParameters(ContractDescription contractDescription, ServiceEndpoint endpoint, BindingParameterCollection bindingParameters)
@@ -37,4 +32,4 @@ public void Validate(ContractDescription contractDescription, ServiceEndpoint en
3732
{
3833
}
3934
}
40-
}
35+
}

Unity.Wcf/UnityInstanceProvider.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.ServiceModel;
33
using System.ServiceModel.Channels;
44
using System.ServiceModel.Dispatcher;
@@ -12,18 +12,8 @@ public class UnityInstanceProvider : IInstanceProvider
1212

1313
public UnityInstanceProvider(IUnityContainer container, Type contractType)
1414
{
15-
if (container == null)
16-
{
17-
throw new ArgumentNullException("container");
18-
}
19-
20-
if (contractType == null)
21-
{
22-
throw new ArgumentNullException("contractType");
23-
}
24-
25-
_container = container;
26-
_contractType = contractType;
15+
_container = container ?? throw new ArgumentNullException("container");
16+
_contractType = contractType ?? throw new ArgumentNullException("contractType");
2717
}
2818

2919
public object GetInstance(InstanceContext instanceContext, Message message)
@@ -44,4 +34,4 @@ public void ReleaseInstance(InstanceContext instanceContext, object instance)
4434
instanceContext.Extensions.Find<UnityInstanceContextExtension>().DisposeOfChildContainer();
4535
}
4636
}
47-
}
37+
}

0 commit comments

Comments
 (0)