Added check for IsGenericType in IsGroupingKey

Gunnar Liljas · Gunnar Liljas · commit 36e86ca300f6 · 2015-01-03T23:14:32.000+01:00
diff --git a/src/NHibernate/Linq/ExpressionExtensions.cs b/src/NHibernate/Linq/ExpressionExtensions.cs
@@ -11,7 +11,7 @@ public static class ExpressionExtensions
 		public static bool IsGroupingKey(this MemberExpression expression)
 		{
 			return expression.Member.Name == "Key" && expression.Member.DeclaringType!=null &&
-			       expression.Member.DeclaringType.GetGenericTypeDefinition() == typeof (IGrouping<,>);
+					 expression.Member.DeclaringType.IsGenericType && expression.Member.DeclaringType.GetGenericTypeDefinition() == typeof(IGrouping<,>);
 		}
 
 		public static bool IsGroupingKeyOf(this MemberExpression expression,GroupResultOperator groupBy)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public static class ExpressionExtensions`
`11`	`11`	`public static bool IsGroupingKey(this MemberExpression expression)`
`12`	`12`	`{`
`13`	`13`	`return expression.Member.Name == "Key" && expression.Member.DeclaringType!=null &&`
`14`		`- expression.Member.DeclaringType.GetGenericTypeDefinition() == typeof (IGrouping<,>);`
	`14`	`+ expression.Member.DeclaringType.IsGenericType && expression.Member.DeclaringType.GetGenericTypeDefinition() == typeof(IGrouping<,>);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public static bool IsGroupingKeyOf(this MemberExpression expression,GroupResultOperator groupBy)`