Fix Basic type lookup

Author: bahusoid

src/NHibernate/Type/TypeFactory.cs

@@ -566,13 +566,13 @@ public static IType HeuristicType(string typeName, IDictionary<string, string> p
 		/// </summary>
 		private static IType HeuristicType(System.Type resolvedType, string typeName, IDictionary<string, string> parameters, int? length)
 		{
-			if (resolvedType == null)
-			{
-				IType type = Basic(typeName, parameters);
+			IType type = Basic(resolvedType?.AssemblyQualifiedName ?? typeName, parameters);
 
-				if (type != null)
-					return type;
+			if (type != null)
+				return type;
 
+			if (resolvedType == null)
+			{
 				string[] parsedTypeName;
 				var typeClassification = GetTypeClassification(typeName);
 				if (typeClassification == TypeClassification.LengthOrScale)
@@ -601,7 +601,7 @@ private static IType HeuristicType(System.Type resolvedType, string typeName, ID
 			{
 				try
 				{
-					var type = (IType) Environment.ObjectsFactory.CreateInstance(typeClass);
+					type = (IType) Environment.ObjectsFactory.CreateInstance(typeClass);
 					InjectParameters(type, parameters);
 
 					var obsolete = typeClass.GetCustomAttribute<ObsoleteAttribute>(false);