Skip to content

Commit 4686c55

Browse files
ShirAvnerikzu
authored andcommitted
Minor enhancement to avoid null exceptions
1 parent fb16d5e commit 4686c55

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/Moq/Async/AwaitableFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static IAwaitableFactory Create(Type awaitableFactoryType, Type awaitableType)
3030
awaitableType.GetGenericArguments()));
3131
}
3232

33-
public static IAwaitableFactory TryGet(Type type)
33+
public static IAwaitableFactory? TryGet(Type type)
3434
{
3535
Debug.Assert(type != null);
3636

src/Moq/ExpressionExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void Split(Expression e, out Expression r /* remainder */, out MethodExpectation
296296
var memberAccessExpression = (MemberExpression)e;
297297
Debug.Assert(memberAccessExpression.Member is PropertyInfo);
298298

299-
if (IsResult(memberAccessExpression.Member, out var awaitableFactory))
299+
if (IsResult(memberAccessExpression.Member, out var awaitableFactory) && awaitableFactory is not null)
300300
{
301301
Split(memberAccessExpression.Expression, out r, out p);
302302
p.AddResultExpression(
@@ -339,7 +339,7 @@ void Split(Expression e, out Expression r /* remainder */, out MethodExpectation
339339
}
340340
}
341341

342-
bool IsResult(MemberInfo member, out IAwaitableFactory awaitableFactory)
342+
bool IsResult(MemberInfo member, out IAwaitableFactory? awaitableFactory)
343343
{
344344
var instanceType = member.DeclaringType;
345345
awaitableFactory = AwaitableFactory.TryGet(instanceType);

0 commit comments

Comments
 (0)