Resolve merge conflicts

hazzik · hazzik · commit c4cc1eff9efb · 2024-06-09T12:09:51.000+10:00
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs
@@ -390,12 +390,12 @@ private Property CreateProperty(IEntityPropertyMapping propertyMapping, System.T
 		{
 			var type = propertyOwnerType?.UnwrapIfNullable();
 			if (string.IsNullOrEmpty(propertyMapping.Name))
-				throw new MappingException("A property mapping must define the name attribute [" + propertyOwnerType + "]");
+				throw new MappingException("A property mapping must define the name attribute [" + type + "]");
 
 			var propertyAccessorName = GetPropertyAccessorName(propertyMapping.Access);
 
-			if (propertyOwnerType != null && value.IsSimpleValue)
-				value.SetTypeUsingReflection(propertyOwnerType, propertyMapping.Name, propertyAccessorName);
+			if (type != null)
+				value.SetTypeUsingReflection(type, propertyMapping.Name, propertyAccessorName);
 
 			return new Property
 			{

Original file line number	Diff line number	Diff line change
`@@ -390,12 +390,12 @@ private Property CreateProperty(IEntityPropertyMapping propertyMapping, System.T`
`390`	`390`	`{`
`391`	`391`	`var type = propertyOwnerType?.UnwrapIfNullable();`
`392`	`392`	`if (string.IsNullOrEmpty(propertyMapping.Name))`
`393`		`- throw new MappingException("A property mapping must define the name attribute [" + propertyOwnerType + "]");`
	`393`	`+ throw new MappingException("A property mapping must define the name attribute [" + type + "]");`
`394`	`394`
`395`	`395`	`var propertyAccessorName = GetPropertyAccessorName(propertyMapping.Access);`
`396`	`396`
`397`		`- if (propertyOwnerType != null && value.IsSimpleValue)`
`398`		`- value.SetTypeUsingReflection(propertyOwnerType, propertyMapping.Name, propertyAccessorName);`
	`397`	`+ if (type != null)`
	`398`	`+ value.SetTypeUsingReflection(type, propertyMapping.Name, propertyAccessorName);`
`399`	`399`
`400`	`400`	`return new Property`
`401`	`401`	`{`