From 52dc59aa1447e41f4229b4db0f1fed4ce94b1116 Mon Sep 17 00:00:00 2001
From: Yuriy Anisimov <Anisimov.Yuriy@gmail.com>
Date: Sun, 15 Nov 2015 14:06:37 -0800
Subject: [PATCH] When using fields - not properties inside of ".Member" -
 throws Exception #59

---
 ExpressMapper NET40/MemberConfiguration.cs | 12 ++++++++++--
 ExpressMapper.Tests NET40/BasicTests.cs    | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ExpressMapper NET40/MemberConfiguration.cs b/ExpressMapper NET40/MemberConfiguration.cs
index 4beb91e..558f30f 100644
--- a/ExpressMapper NET40/MemberConfiguration.cs	
+++ b/ExpressMapper NET40/MemberConfiguration.cs	
@@ -59,7 +59,11 @@ public IMemberConfiguration<T, TN> Member<TMember, TNMember>(Expression<Func<TN,
 
             var propertyInfo = typeof(TN).GetProperty(memberExpression.Member.Name);
 
-            if (propertyInfo.CanWrite && propertyInfo.GetSetMethod(true).IsPublic)
+            if (propertyInfo != null && !propertyInfo.CanWrite || (propertyInfo != null && propertyInfo.CanWrite && !propertyInfo.GetSetMethod(true).IsPublic))
+            {
+                Ignore(dest);
+            }
+            else
             {
                 foreach (var typeMapper in _typeMappers)
                 {
@@ -79,7 +83,11 @@ public IMemberConfiguration<T, TN> Function<TMember, TNMember>(Expression<Func<T
 
             var propertyInfo = typeof(TN).GetProperty(memberExpression.Member.Name);
 
-            if (propertyInfo.CanWrite && propertyInfo.GetSetMethod(true).IsPublic)
+            if (propertyInfo != null && !propertyInfo.CanWrite && !propertyInfo.GetSetMethod(true).IsPublic)
+            {
+                Ignore(dest);
+            }
+            else
             {
                 foreach (var typeMapper in _typeMappers)
                 {
diff --git a/ExpressMapper.Tests NET40/BasicTests.cs b/ExpressMapper.Tests NET40/BasicTests.cs
index cd32d31..dcf9bd0 100644
--- a/ExpressMapper.Tests NET40/BasicTests.cs	
+++ b/ExpressMapper.Tests NET40/BasicTests.cs	
@@ -50,6 +50,24 @@ public void FieldsTest()
             Assert.AreEqual(bvm, srcAndDest.Value);
         }
 
+        [Test]
+        public void CustomMemberAndFunctionFieldsTest()
+        {
+            Mapper.Register<Brand, BrandViewModel>();
+            Mapper.Register<Table, TableViewModel>()
+                .Member(t => t.Id, t => t.Id)
+                .Function(t => t.Name, t => t.Name);
+            Mapper.Register<Size, SizeViewModel>();
+            Mapper.Register<Country, CountryViewModel>();
+            Mapper.Compile();
+
+            var srcAndDest = Functional.FieldsTestMap();
+
+            var bvm = Mapper.Map<Table, TableViewModel>(srcAndDest.Key);
+
+            Assert.AreEqual(bvm, srcAndDest.Value);
+        }
+
         [Test]
         public void MappingOrderLessTest()
         {