NH-3251: Fixed the last two discriminator test failures.

Author: patearl

src/NHibernate/Hql/Ast/ANTLR/Tree/BinaryLogicOperatorNode.cs

@@ -276,29 +276,25 @@ private void ProcessMetaTypeDiscriminatorIfNecessary(IASTNode lhs, IASTNode rhs)
 			{
 				return;
 			}
-			if (rhsNode.Text == null)
+
+			var lhsNodeMetaType = lhsNode.DataType as MetaType;
+			if (lhsNodeMetaType != null)
 			{
-				var lhsNodeMetaType = lhsNode.DataType as MetaType;
-				if (lhsNodeMetaType != null)
-				{
-					string className = SessionFactoryHelper.GetImportedClassName(rhsNode.OriginalText);
+				string className = SessionFactoryHelper.GetImportedClassName(rhsNode.OriginalText);
 
-					object discriminatorValue = lhsNodeMetaType.GetMetaValue(TypeNameParser.Parse(className).Type);
-					rhsNode.Text = discriminatorValue.ToString();
-					return;
-				}
+				object discriminatorValue = lhsNodeMetaType.GetMetaValue(TypeNameParser.Parse(className).Type);
+				rhsNode.Text = discriminatorValue.ToString();
+				return;
 			}
-			if (lhsNode.Text == null)
+
+			var rhsNodeMetaType = rhsNode.DataType as MetaType;
+			if (rhsNodeMetaType != null)
 			{
-				var rhsNodeMetaType = rhsNode.DataType as MetaType;
-				if (rhsNodeMetaType != null)
-				{
-					string className = SessionFactoryHelper.GetImportedClassName(lhsNode.OriginalText);
+				string className = SessionFactoryHelper.GetImportedClassName(lhsNode.OriginalText);
 
-					object discriminatorValue = rhsNodeMetaType.GetMetaValue(TypeNameParser.Parse(className).Type);
-					lhsNode.Text = discriminatorValue.ToString();
-					return;
-				}
+				object discriminatorValue = rhsNodeMetaType.GetMetaValue(TypeNameParser.Parse(className).Type);
+				lhsNode.Text = discriminatorValue.ToString();
+				return;
 			}
 		}
 	}