Removing dictionary entries from index access checks

Author: SteveWilkes

AgileMapper.UnitTests/WhenFlatteningToDictionaries.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using TestClasses;
     using Xunit;
 
@@ -48,14 +49,24 @@ public void ShouldFlattenAComplexTypeMember()
         }
 
         [Fact]
-        public void ShouldFlattenANullableComplexTypeMember()
+        public void ShouldFlattenANullNullableDateTimeOffsetMember()
         {
             var source = new PublicProperty<DateTimeOffset?> { Value = null };
             var result = Mapper.Flatten(source).ToDictionary<string>();
 
             result.ShouldNotContainKey("Value");
         }
 
+        [Fact]
+        public void ShouldFlattenANullNullableIntToAStringDictionary()
+        {
+            var source = new PublicTwoFields<int?, int?> { Value1 = 123, Value2 = null };
+            var result = Mapper.Flatten(source).ToDictionary<string>();
+
+            result["Value1"].ShouldBe("123");
+            result.ShouldNotContainKey("Value2");
+        }
+
         [Fact]
         public void ShouldHandleANullComplexTypeMember()
         {

AgileMapper/Members/ExpressionInfoFinder.cs

@@ -212,6 +212,7 @@ private static bool IsNullableHasValueAccess(MemberExpression memberAccess)
             protected override Expression VisitIndex(IndexExpression indexAccess)
             {
                 if ((indexAccess.Object.Type != typeof(string)) &&
+                     !indexAccess.Object.Type.IsDictionary() &&
                      IndexDoesNotUseParameter(indexAccess.Arguments[0]))
                 {
                     AddMemberAccess(indexAccess);