Merge pull request #22904 from jrafanie/delay_descendant_loader_until…

…_app_initialized Only run load_subclasses after app is initialized
ManageIQ · Feb 21, 2024 · f5e3575 · f5e3575
2 parents ac938b1 + a7aa6b4
commit f5e3575
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/extensions/descendant_loader.rb b/lib/extensions/descendant_loader.rb
@@ -263,7 +263,7 @@ def scoped_name(name, scopes)
 
   module ArDescendantsWithLoader
     def descendants
-      unless defined? @loaded_descendants
+      if Vmdb::Application.instance.initialized? && !defined? @loaded_descendants
         @loaded_descendants = true
         DescendantLoader.instance.load_subclasses(self)
       end
@@ -275,7 +275,7 @@ def descendants
     # https://github.com/rails/rails/commit/8f8aa857e084b76b1120edaa9bb9ce03ba1e6a19
     # We need to get in front of it, like we do for descendants.
     def subclasses
-      unless defined? @loaded_descendants
+      if Vmdb::Application.instance.initialized? && !defined? @loaded_descendants
         @loaded_descendants = true
         DescendantLoader.instance.load_subclasses(self)
       end