Merge branch 'ExtensionMethodNull' of https://github.com/lbargaoanu/A…

…utoMapper into ExtensionMethodNull
baj9032 · Aug 21, 2017 · 0ffe31c · 0ffe31c
2 parents a6e1427 + 09877eb
commit 0ffe31c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/AutoMapper/Internal/ExpressionFactory.cs b/src/AutoMapper/Internal/ExpressionFactory.cs
@@ -119,14 +119,11 @@ public static Expression NullCheck(Expression expression, Type destinationType)
                 if(target is MemberExpression member)
                 {
                     target = member.Expression;
-                    if(!member.Member.IsStatic())
-                    {
-                        NullCheck();
-                    }
+                    NullCheck();
                 }
                 else if(target is MethodCallExpression method)
                 {
-                    target = method.Method.IsStatic() ? method.Arguments[0] : method.Object;
+                    target = method.Method.IsStatic() ? method.Arguments.FirstOrDefault() : method.Object;
                     NullCheck();
                 }
                 else if(target?.NodeType == ExpressionType.Parameter)
@@ -143,7 +140,7 @@ public static Expression NullCheck(Expression expression, Type destinationType)
             while(true);
             void NullCheck()
             {
-                if(target.Type.IsValueType())
+                if(target == null || target.Type.IsValueType())
                 {
                     return;
                 }
@@ -238,4 +235,4 @@ public override Expression Visit(Expression node)
             protected override Expression VisitLambda<T>(Expression<T> node) => Lambda(Visit(node.Body), node.Parameters);
         }
     }
-}
+}
diff --git a/src/UnitTests/ExtensionMethods.cs b/src/UnitTests/ExtensionMethods.cs
@@ -31,12 +31,13 @@ public class Bar
         public class FooDto
         {
             public string BarSimpleName { get; set; }
+            public Guid Value { get; set; }
         }
 
         protected override MapperConfiguration Configuration => new MapperConfiguration(cfg =>
         {
             cfg.IncludeSourceExtensionMethods(typeof(BarExtensions));
-            cfg.CreateMap<Foo, FooDto>();
+            cfg.CreateMap<Foo, FooDto>().ForMember(d=>d.Value, o=>o.MapFrom(s=>Guid.NewGuid()));
         });
 
         [Fact]