NH-2963 - Exception when map an IList(Of T) by Code in VB.NET

Author: haugjan

src/NHibernate.Test.VisualBasic/Issues/NH2963/Entity.vb

@@ -0,0 +1,16 @@
+
+
+Namespace Issues.NH2963
+    Public Class Entity
+        Private _childs As IList(Of String)
+
+        Public Property Childs As IList(Of String)
+            Get
+                Return _childs
+            End Get
+            Set
+                _childs = value
+            End Set
+        End Property
+    End Class
+End Namespace

src/NHibernate.Test.VisualBasic/Issues/NH2963/Fixture.vb

@@ -0,0 +1,17 @@
+Imports NHibernate.Mapping.ByCode
+Imports NUnit.Framework
+
+Namespace Issues.NH2963
+    <TestFixture()>
+    Public Class Fixture
+        <Test>
+        Public Sub GenericDecodeMemberAccessExpressionForCollectionAsEnumerableShouldReturnMemberOfDeclaringClass()
+            TypeExtensions.DecodeMemberAccessExpression (Of Entity, IEnumerable(Of String))(Function(mc) mc.Childs)
+        End Sub
+
+        <Test>
+        Public Sub GenericDecodeMemberAccessExpressionOfForCollectionAsEnumerableShouldReturnMemberOfDeclaringClass()
+            TypeExtensions.DecodeMemberAccessExpressionOf (Of Entity, IEnumerable(Of String))(Function(mc) mc.Childs)
+        End Sub
+    End Class
+End Namespace

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

@@ -71,6 +71,8 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Issues\NH2963\Entity.vb" />
+    <Compile Include="Issues\NH2963\Fixture.vb" />
     <Compile Include="Issues\NH0000\Entity.vb" />
     <Compile Include="Issues\NH0000\Fixture.vb" />
     <Compile Include="Issues\IssueTestCase.vb" />

src/NHibernate/Mapping/ByCode/TypeExtensions.cs

@@ -51,7 +51,7 @@ public static System.Type GetPropertyOrFieldType(this MemberInfo propertyOrField
 				return ((FieldInfo) propertyOrField).FieldType;
 			}
 			throw new ArgumentOutOfRangeException("propertyOrField",
-			                                      "Expected PropertyInfo or FieldInfo; found :" + propertyOrField.MemberType);
+												  "Expected PropertyInfo or FieldInfo; found :" + propertyOrField.MemberType);
 		}
 
 		public static MemberInfo DecodeMemberAccessExpression<TEntity>(Expression<Func<TEntity, object>> expression)
@@ -63,7 +63,7 @@ public static MemberInfo DecodeMemberAccessExpression<TEntity>(Expression<Func<T
 					return ((MemberExpression) ((UnaryExpression) expression.Body).Operand).Member;
 				}
 				throw new Exception(string.Format("Invalid expression type: Expected ExpressionType.MemberAccess, Found {0}",
-				                                  expression.Body.NodeType));
+												  expression.Body.NodeType));
 			}
 			return ((MemberExpression) expression.Body).Member;
 		}
@@ -86,7 +86,7 @@ public static MemberInfo DecodeMemberAccessExpressionOf<TEntity>(Expression<Func
 				else
 				{
 					throw new Exception(string.Format("Invalid expression type: Expected ExpressionType.MemberAccess, Found {0}",
-					                                  expression.Body.NodeType));
+													  expression.Body.NodeType));
 				}
 			}
 			else
@@ -110,12 +110,12 @@ public static MemberInfo DecodeMemberAccessExpression<TEntity, TProperty>(Expres
 		{
 			if (expression.Body.NodeType != ExpressionType.MemberAccess)
 			{
-				if ((expression.Body.NodeType == ExpressionType.Convert) && (expression.Body.Type == typeof (object)))
+				if ((expression.Body.NodeType == ExpressionType.Convert) && (expression.Body.Type == typeof(TProperty)))
 				{
 					return ((MemberExpression) ((UnaryExpression) expression.Body).Operand).Member;
 				}
 				throw new Exception(string.Format("Invalid expression type: Expected ExpressionType.MemberAccess, Found {0}",
-				                                  expression.Body.NodeType));
+												  expression.Body.NodeType));
 			}
 			return ((MemberExpression) expression.Body).Member;
 		}
@@ -132,14 +132,14 @@ public static MemberInfo DecodeMemberAccessExpressionOf<TEntity, TProperty>(Expr
 			MemberInfo memberOfDeclaringType;
 			if (expression.Body.NodeType != ExpressionType.MemberAccess)
 			{
-				if ((expression.Body.NodeType == ExpressionType.Convert) && (expression.Body.Type == typeof (object)))
+				if ((expression.Body.NodeType == ExpressionType.Convert) && (expression.Body.Type == typeof(TProperty)))
 				{
 					memberOfDeclaringType = ((MemberExpression) ((UnaryExpression) expression.Body).Operand).Member;
 				}
 				else
 				{
 					throw new Exception(string.Format("Invalid expression type: Expected ExpressionType.MemberAccess, Found {0}",
-					                                  expression.Body.NodeType));
+													  expression.Body.NodeType));
 				}
 			}
 			else
@@ -333,7 +333,7 @@ public static MemberInfo GetFirstPropertyOfType(this System.Type propertyContain
 		}
 
 		public static MemberInfo GetFirstPropertyOfType(this System.Type propertyContainerType, System.Type propertyType, BindingFlags bindingFlags,
-		                                                Func<PropertyInfo, bool> acceptPropertyClauses)
+														Func<PropertyInfo, bool> acceptPropertyClauses)
 		{
 			if (acceptPropertyClauses == null)
 			{