Merge pull request rails#53969 from fatkodima/rewrite-confusing-code

Rewrite confusing code for getting association class

Author: kamipo

activerecord/lib/active_record/reflection.rb

@@ -425,10 +425,14 @@ def klass
 
       def _klass(class_name) # :nodoc:
         if active_record.name.demodulize == class_name
-          return compute_class("::#{class_name}") rescue NameError
+          begin
+            compute_class("::#{class_name}")
+          rescue NameError
+            compute_class(class_name)
+          end
+        else
+          compute_class(class_name)
         end
-
-        compute_class(class_name)
       end
 
       def compute_class(name)