Fix cloning entities with non public parameterless constructor

Author: maca88

Source/NHibernate.Extensions.Tests/BaseIncludeTest.cs

@@ -56,10 +56,10 @@ public void Cleanup()
         protected void FillData()
         {
             var system = new EQBUser { UserName = "System" };
-            var ana = new EQBPerson { Age = 23, Name = "Ana", CreatedBy = system };
-            var rok = new EQBPerson { Age = 24, Name = "Rok", CreatedBy = system };
-            var simon = new EQBPerson { Age = 25, Name = "Simon", CreatedBy = system };
-            var petra = new EQBPerson { Age = 22, Name = "Petra", CreatedBy = system };
+            var ana = new EQBPerson("Ana") { Age = 23, CreatedBy = system };
+            var rok = new EQBPerson("Rok") { Age = 24, CreatedBy = system };
+            var simon = new EQBPerson("Simon") { Age = 25, CreatedBy = system };
+            var petra = new EQBPerson("Petra") { Age = 22, CreatedBy = system };
 
             //Setting best friends
             petra.BestFriend = ana;

Source/NHibernate.Extensions.Tests/Entities/EQBPerson.cs

@@ -15,7 +15,12 @@ public interface IPerson
 
     public partial class EQBPerson : Entity, IPerson
     {
-        public EQBPerson()
+        public EQBPerson(string name) : this()
+        {
+            Name = name;
+        }
+
+        protected EQBPerson()
         {
             CurrentOwnedVehicles = new HashSet<EQBVehicle>();
             OwnedHouses = new HashSet<EQBHouse>();

Source/NHibernate.Extensions/DeepClone/DeepCloneSessionExtension.cs

@@ -10,6 +10,7 @@
 using NHibernate.Persister.Entity;
 using NHibernate.Proxy;
 using NHibernate.Type;
+using NHibernate.Util;
 
 namespace NHibernate.Extensions
 {
@@ -201,9 +202,9 @@ private static object DeepClone(this ISessionImplementor session, object entity,
             IDictionary<object, object> resolvedEntities, DeepCloneParentEntity parentEntity = null)
         {
             opts = opts ?? new DeepCloneOptions();
-            if (entity == null)
+            if (entity == null || !NHibernateUtil.IsInitialized(entity))
                 return entityType.GetDefaultValue();
-            entityType = entityType ?? entity.GetUnproxiedType();
+            entityType = entityType ?? entity.GetUnproxiedType(true);
 
             if (entityType.IsSimpleType())
                 return entity;
@@ -218,9 +219,6 @@ private static object DeepClone(this ISessionImplementor session, object entity,
                 return entityType.GetDefaultValue();
             }
 
-            if (!NHibernateUtil.IsInitialized(entity))
-                return entityType.GetDefaultValue();
-
             if (resolvedEntities.ContainsKey(entity) && parentEntity != null)
                 return CopyOnlyForeignKeyProperties(resolvedEntities[entity], entityType, entityMetadata, opts, parentEntity);
 
@@ -231,7 +229,7 @@ private static object DeepClone(this ISessionImplementor session, object entity,
                 return entity;
 
             var propertyInfos = entityType.GetProperties();
-            var copiedEntity = Activator.CreateInstance(entityType);
+            var copiedEntity = ReflectHelper.GetDefaultConstructor(entityType).Invoke(new object[0]);
             resolvedEntities.Add(entity, copiedEntity);
 
             foreach (var propertyInfo in propertyInfos
@@ -293,7 +291,7 @@ private static object DeepClone(this ISessionImplementor session, object entity,
                     propertyInfo.SetValue(copiedEntity, propertyList, null);
                     AddItemToCollection(propertyList, propertyValue, o => copyAsReference
                         ? o
-                        : session.DeepClone(o, opts, o.GetUnproxiedType(), resolvedEntities,
+                        : session.DeepClone(o, opts, null, resolvedEntities,
                             new DeepCloneParentEntity
                             {
                                 Entity = copiedEntity,

Source/NHibernate.Extensions/Internal/TypeHelper.cs

@@ -23,29 +23,26 @@ public static bool IsSubclassOfRawGeneric(System.Type generic, System.Type toChe
         /// <summary>
         /// Gets the underlying class type of a persistent object that may be proxied
         /// </summary>
-        public static System.Type GetUnproxiedType(this object persistentObject)
+        public static System.Type GetUnproxiedType(this object entity, bool allowInitialization)
         {
-            var proxy = persistentObject as INHibernateProxy;
-            if (proxy != null)
-                return proxy.HibernateLazyInitializer.PersistentClass;
-
-            var nhProxy = persistentObject as IProxy;
-            if (nhProxy == null)
-                return persistentObject.GetType();
+            if (entity is INHibernateProxy nhProxy)
+            {
+                if (nhProxy.HibernateLazyInitializer.IsUninitialized && !allowInitialization)
+                {
+                    return nhProxy.HibernateLazyInitializer.PersistentClass;
+                }
 
-            var lazyInitializer = nhProxy.Interceptor as ILazyInitializer;
-            if (lazyInitializer != null)
-                return lazyInitializer.PersistentClass;
+                // We have to initialize in case of a subclass to get the concrete type
+                entity = nhProxy.HibernateLazyInitializer.GetImplementation();
+            }
 
-            var fieldInterceptorAccessor = nhProxy.Interceptor as IFieldInterceptorAccessor;
-            if (fieldInterceptorAccessor != null)
+            switch (entity)
             {
-                return fieldInterceptorAccessor.FieldInterceptor == null
-                    ? nhProxy.GetType().BaseType
-                    : fieldInterceptorAccessor.FieldInterceptor.MappedClass;
+                case IFieldInterceptorAccessor interceptorAccessor:
+                    return interceptorAccessor.FieldInterceptor.MappedClass;
+                default:
+                    return entity.GetType();
             }
-
-            return persistentObject.GetType();
         }
 	}
 }