Merge pull request #722 from hadashiA/ku/fix-null

Fix null error in duplication registration
hadashiA · Nov 16, 2024 · d7c2ed6 · d7c2ed6
2 parents 32202fd + 9285e17
commit d7c2ed6
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 156 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Registry.cs b/VContainer/Assets/VContainer/Runtime/Registry.cs
@@ -46,7 +46,7 @@ public static Registry Build(Registration[] registrations)
 
         static void AddToBuildBuffer(IDictionary<Type, Registration> buf, Type service, Registration registration)
         {
-            if (buf.TryGetValue(service, out var exists))
+            if (buf.TryGetValue(service, out var exists) && exists != null)
             {
                 CollectionInstanceProvider collection;
                 if (buf.TryGetValue(RuntimeTypeCache.EnumerableTypeOf(service), out var found) &&

diff --git a/VContainer/Assets/VContainer/Runtime/Unity/InstanceProviders/PrefabComponentProvider.cs b/VContainer/Assets/VContainer/Runtime/Unity/InstanceProviders/PrefabComponentProvider.cs
@@ -27,37 +27,37 @@ public object SpawnInstance(IObjectResolver resolver)
         {
             var prefab = prefabFinder(resolver);
             var parent = destination.GetParent(resolver);
-            
+
             var wasActive = prefab.gameObject.activeSelf;
-            using var dirtyScope = new ObjectResolverUnityExtensions.PrefabDirtyScope(prefab.gameObject);
-
-            if (wasActive)
+            using (new ObjectResolverUnityExtensions.PrefabDirtyScope(prefab.gameObject))
             {
-                prefab.gameObject.SetActive(false);
-            }
-
-            var component = parent != null
-                ? UnityEngine.Object.Instantiate(prefab, parent)
-                : UnityEngine.Object.Instantiate(prefab);
+                if (wasActive)
+                {
+                    prefab.gameObject.SetActive(false);
+                }
 
-            if (VContainerSettings.Instance != null && VContainerSettings.Instance.RemoveClonePostfix)
-                component.name = prefab.name;
+                var component = parent != null
+                    ? UnityEngine.Object.Instantiate(prefab, parent)
+                    : UnityEngine.Object.Instantiate(prefab);
 
-            try
-            {
-                injector.Inject(component, resolver, customParameters);
-                destination.ApplyDontDestroyOnLoadIfNeeded(component);
-            }
-            finally
-            {
-                if (wasActive)
+                if (VContainerSettings.Instance != null && VContainerSettings.Instance.RemoveClonePostfix)
+                    component.name = prefab.name;
+
+                try
                 {
-                    prefab.gameObject.SetActive(true);
-                    component.gameObject.SetActive(true);
+                    injector.Inject(component, resolver, customParameters);
+                    destination.ApplyDontDestroyOnLoadIfNeeded(component);
                 }
+                finally
+                {
+                    if (wasActive)
+                    {
+                        prefab.gameObject.SetActive(true);
+                        component.gameObject.SetActive(true);
+                    }
+                }
+                return component;
             }
-
-            return component;
         }
     }
 }
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs b/VContainer/Assets/VContainer/Runtime/Unity/LifetimeScope.cs
@@ -263,24 +263,25 @@ public TScope CreateChildFromPrefab<TScope>(TScope prefab, IInstaller installer
             where TScope : LifetimeScope
         {
             var wasActive = prefab.gameObject.activeSelf;
-            using var dirtyScope = new ObjectResolverUnityExtensions.PrefabDirtyScope(prefab.gameObject);
-
-            if (wasActive)
-            {
-                prefab.gameObject.SetActive(false);
-            }
-            var child = Instantiate(prefab, transform, false);
-            if (installer != null)
-            {
-                child.localExtraInstallers.Add(installer);
-            }
-            child.parentReference.Object = this;
-            if (wasActive)
+            using (new ObjectResolverUnityExtensions.PrefabDirtyScope(prefab.gameObject))
             {
-                prefab.gameObject.SetActive(true);
-                child.gameObject.SetActive(true);
+                if (wasActive)
+                {
+                    prefab.gameObject.SetActive(false);
+                }
+                var child = Instantiate(prefab, transform, false);
+                if (installer != null)
+                {
+                    child.localExtraInstallers.Add(installer);
+                }
+                child.parentReference.Object = this;
+                if (wasActive)
+                {
+                    prefab.gameObject.SetActive(true);
+                    child.gameObject.SetActive(true);
+                }
+                return child;
             }
-            return child;
         }
 
         public TScope CreateChildFromPrefab<TScope>(TScope prefab, Action<IContainerBuilder> installation)
@@ -317,7 +318,7 @@ LifetimeScope GetRuntimeParent()
 
             if (parentReference.Object != null)
                 return parentReference.Object;
-            
+
             // Find via implementation
             var implParent = FindParent();
             if (implParent != null)