Refactor

hadashiA · Oct 9, 2020 · 25c0fdf · 25c0fdf
1 parent 8c50ad5
commit 25c0fdf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/VContainer/Assets/VContainer/Runtime/Container.cs b/VContainer/Assets/VContainer/Runtime/Container.cs
@@ -63,11 +63,15 @@ public object Resolve(IRegistration registration)
                     return registration.SpawnInstance(this);
 
                 case Lifetime.Singleton:
+                    if (Parent is null)
+                    {
+                        return Root.Resolve(registration);
+                    }
                     if (registry.Exists(registration))
                     {
                         return sharedInstances.GetOrAdd(registration, createInstance).Value;
                     }
-                    return (Parent.Parent is null ? Parent.Root : Parent).Resolve(registration);
+                    return Parent.Resolve(registration);
 
                 case Lifetime.Scoped:
                     var lazy = sharedInstances.GetOrAdd(registration, createInstance);