Fixing sample application

Author: ENikS

src/Strategies/LifetimeStrategy.cs

@@ -82,7 +82,8 @@ public override void PostBuildUp(ref BuilderContext context)
             if (null == policy || policy is PerResolveLifetimeManager)
                 policy = (LifetimeManager)context.Get(typeof(LifetimeManager));
 
-            policy?.SetValue(context.Existing, context.Lifetime);
+            if (LifetimeManager.NoValue != context.Existing)
+                policy?.SetValue(context.Existing, context.Lifetime);
         }
 
         #endregion

src/UnityContainer.IUnityContainer.cs

@@ -233,6 +233,8 @@ bool IUnityContainer.IsRegistered(Type type, string name) => ReferenceEquals(All
         /// <inheritdoc />
         object IUnityContainer.Resolve(Type type, string name, params ResolverOverride[] overrides)
         {
+            var n = type.FullName;
+
             // Verify arguments
             if (null == type) throw new ArgumentNullException(nameof(type));
 

src/UnityContainer.Registration.cs

@@ -478,30 +478,23 @@ private IPolicySet GetOrAddGeneric(Type type, string name, Type definition)
             var collisions = 0;
             int hashCode;
             int targetBucket;
-            var factory = false;
+            InternalRegistration factory = null;
 
-            if (null != _parent)
+            hashCode = (definition?.GetHashCode() ?? 0) & 0x7FFFFFFF;
+            targetBucket = hashCode % _registrations.Buckets.Length;
+            for (var j = _registrations.Buckets[targetBucket]; j >= 0; j = _registrations.Entries[j].Next)
             {
-                hashCode = (definition?.GetHashCode() ?? 0) & 0x7FFFFFFF;
-                targetBucket = hashCode % _registrations.Buckets.Length;
-                for (var j = _registrations.Buckets[targetBucket]; j >= 0; j = _registrations.Entries[j].Next)
+                ref var candidate = ref _registrations.Entries[j];
+                if (candidate.HashCode != hashCode || candidate.Key != definition)
                 {
-                    ref var candidate = ref _registrations.Entries[j];
-                    if (candidate.HashCode != hashCode || candidate.Key != definition)
-                    {
-                        continue;
-                    }
-
-                    if (null != candidate.Value?[name])
-                    {
-                        factory = true;
-                        break;
-                    }
+                    continue;
                 }
 
-                if (!factory) return _parent._getGenericRegistration(type, name, definition);
+                if (null != (factory = (InternalRegistration)candidate.Value?[name])) break;
             }
 
+            if (null == factory && null != _parent) return _parent._getGenericRegistration(type, name, definition);
+
             hashCode = (type?.GetHashCode() ?? 0) & 0x7FFFFFFF;
             targetBucket = hashCode % _registrations.Buckets.Length;
 
@@ -527,7 +520,7 @@ private IPolicySet GetOrAddGeneric(Type type, string name, Type definition)
                         _registrations.Entries[i].Value = existing;
                     }
 
-                    return existing.GetOrAdd(name, () => CreateRegistration(type, name));
+                    return existing.GetOrAdd(name, () => CreateRegistration(type, name, factory));
                 }
 
                 if (_registrations.RequireToGrow || ListToHashCutPoint < collisions)
@@ -536,7 +529,7 @@ private IPolicySet GetOrAddGeneric(Type type, string name, Type definition)
                     targetBucket = hashCode % _registrations.Buckets.Length;
                 }
 
-                var registration = CreateRegistration(type, name);
+                var registration = CreateRegistration(type, name, factory);
                 ref var entry = ref _registrations.Entries[_registrations.Count];
                 entry.HashCode = hashCode;
                 entry.Next = _registrations.Buckets[targetBucket];

src/UnityContainer.Resolution.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Security;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Unity.Builder;
@@ -39,9 +37,28 @@ private IPolicySet GetDynamicRegistration(Type type, string name)
                 : GetOrAddGeneric(type, name, info.GetGenericTypeDefinition());
         }
 
-        private IPolicySet CreateRegistration(Type type, string name)
+        private IPolicySet CreateRegistration(Type type, string name, InternalRegistration factory)
         {
+            var registration = new InternalRegistration(type, name);
+
+            if (null != factory)
+            {
+                registration.InjectionMembers = factory.InjectionMembers;
+                registration.Map = factory.Map;
+                var lifetime = factory.Get(typeof(LifetimeManager));
+                if (lifetime is IFactoryLifetimeManager ManagerFactory)
+                {
+                    var manager = ManagerFactory.CreateLifetimePolicy();
+                    registration.Set(typeof(LifetimeManager), manager);
+                }
+            }
 
+            registration.BuildChain = GetBuilders(type, registration);
+            return registration;
+        }
+
+        private IPolicySet CreateRegistration(Type type, string name)
+        {
             var registration = new InternalRegistration(type, name);
 
             if (type.GetTypeInfo().IsGenericType)