From dba166bfd317bfeaba7211d2e65fbd760a184f6c Mon Sep 17 00:00:00 2001 From: Garrett Thornburg Date: Fri, 17 Feb 2017 11:40:29 -0700 Subject: Make Visitor visit thread safe by holding dispatch method reference --- lib/arel/visitors/reduce.rb | 5 +++-- lib/arel/visitors/visitor.rb | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/arel/visitors') diff --git a/lib/arel/visitors/reduce.rb b/lib/arel/visitors/reduce.rb index 7948758e2f..1156b780f0 100644 --- a/lib/arel/visitors/reduce.rb +++ b/lib/arel/visitors/reduce.rb @@ -11,9 +11,10 @@ module Arel private def visit object, collector - send dispatch[object.class], object, collector + dispatch_method = dispatch[object.class] + send dispatch_method, object, collector rescue NoMethodError => e - raise e if respond_to?(dispatch[object.class], true) + raise e if respond_to?(dispatch_method, true) superklass = object.class.ancestors.find { |klass| respond_to?(dispatch[klass], true) } diff --git a/lib/arel/visitors/visitor.rb b/lib/arel/visitors/visitor.rb index b96b8238a7..2690c98e3c 100644 --- a/lib/arel/visitors/visitor.rb +++ b/lib/arel/visitors/visitor.rb @@ -27,9 +27,10 @@ module Arel end def visit object - send dispatch[object.class], object + dispatch_method = dispatch[object.class] + send dispatch_method, object rescue NoMethodError => e - raise e if respond_to?(dispatch[object.class], true) + raise e if respond_to?(dispatch_method, true) superklass = object.class.ancestors.find { |klass| respond_to?(dispatch[klass], true) } -- cgit v1.2.3