Fixed compiling of int? -> int due my last refactoring

Author: bahusoid

src/NHibernate.Test/Criteria/Lambda/ExpressionProcessorFindValueFixture.cs

@@ -162,6 +162,38 @@ public void GivenNullableIntegerToIntegerCastFails()
 
 		}
 
+		[Test]
+		public void GivenNullableIntegerToInteger()
+		{
+			int? value = 1;
+			Expression<Func<int>> expression = () => (int) value;
+
+			var actual = GetValue(expression);
+
+			//Check with expression compile and invoke
+			var lambdaExpression = Expression.Lambda(expression).Compile();
+
+			var expected = ((dynamic) lambdaExpression.DynamicInvoke()).Invoke();
+
+			Assert.AreEqual(expected, actual);
+		}
+
+		[Test]
+		public void GivenIntegerToInteger()
+		{
+			int value = 1;
+			Expression<Func<int>> expression = () => (int) value;
+
+			var actual = GetValue(expression);
+
+			//Check with expression compile and invoke
+			var lambdaExpression = Expression.Lambda(expression).Compile();
+
+			var expected = ((dynamic) lambdaExpression.DynamicInvoke()).Invoke();
+
+			Assert.AreEqual(expected, actual);
+		}
+
 		[Test]
 		public void GivenIntegerToNullableIntegerCast()
 		{

src/NHibernate/Impl/ExpressionProcessor.cs

@@ -281,10 +281,20 @@ public static object FindValue(Expression expression)
 					if (unaryExpression.Method != null)
 						return unaryExpression.Method.Invoke(null, new[] { FindValue(unaryExpression.Operand) });
 
-					if (unaryExpression.Type == typeof(object)
-						|| (Nullable.GetUnderlyingType(unaryExpression.Type) ?? unaryExpression.Type) == unaryExpression.Operand.Type)
+					var toType = unaryExpression.Type;
+					var fromType = unaryExpression.Operand.Type;
+					if (toType == typeof(object)
+						|| toType == fromType
+						|| Nullable.GetUnderlyingType(toType) == fromType)
 						return FindValue(unaryExpression.Operand);
 
+					if (toType == Nullable.GetUnderlyingType(fromType))
+					{
+						var val = FindValue(unaryExpression.Operand);
+						if (val != null)
+							return val;
+					}
+
 					break;
 			}