Skip to content

Commit 2fe2cd4

Browse files
committed
Rewrite confusing code for getting association class
1 parent 31953d2 commit 2fe2cd4

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

activerecord/lib/active_record/reflection.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,14 @@ def klass
425425

426426
def _klass(class_name) # :nodoc:
427427
if active_record.name.demodulize == class_name
428-
return compute_class("::#{class_name}") rescue NameError
428+
begin
429+
compute_class("::#{class_name}")
430+
rescue NameError
431+
compute_class(class_name)
432+
end
433+
else
434+
compute_class(class_name)
429435
end
430-
431-
compute_class(class_name)
432436
end
433437

434438
def compute_class(name)

0 commit comments

Comments
 (0)