Merge pull request #12398 from thedarkone/thread-safety-stuff

Thread safety fixes

2 files changed, 27 insertions, 13 deletions

diff --git a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
index da0cddd93c..971cb3447f 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
@@ -9,8 +9,8 @@ module ActionDispatch
         attr_reader :memos
 
         def initialize
-          @regexp_states = Hash.new { |h,k| h[k] = {} }
-          @string_states = Hash.new { |h,k| h[k] = {} }
+          @regexp_states = {}
+          @string_states = {}
           @accepting     = {}
           @memos         = Hash.new { |h,k| h[k] = [] }
         end
@@ -111,14 +111,8 @@ module ActionDispatch
         end
 
         def []=(from, to, sym)
-          case sym
-          when String
-            @string_states[from][sym] = to
-          when Regexp
-            @regexp_states[from][sym] = to
-          else
-            raise ArgumentError, 'unknown symbol: %s' % sym.class
-          end
+          to_mappings = states_hash_for(sym)[from] ||= {}
+          to_mappings[sym] = to
         end
 
         def states
@@ -137,18 +131,35 @@ module ActionDispatch
 
         private
 
+          def states_hash_for(sym)
+            case sym
+            when String
+              @string_states
+            when Regexp
+              @regexp_states
+            else
+              raise ArgumentError, 'unknown symbol: %s' % sym.class
+            end
+          end
+
           def move_regexp(t, a)
             return [] if t.empty?
 
             t.map { |s|
-              @regexp_states[s].map { |re, v| re === a ? v : nil }
+              if states = @regexp_states[s]
+                states.map { |re, v| re === a ? v : nil }
+              end
             }.flatten.compact.uniq
           end
 
           def move_string(t, a)
             return [] if t.empty?
 
-            t.map { |s| @string_states[s][a] }.compact
+            t.map do |s|
+              if states = @string_states[s]
+                states[a]
+              end
+            end.compact
           end
       end
     end
diff --git a/actionpack/lib/action_dispatch/journey/visitors.rb b/actionpack/lib/action_dispatch/journey/visitors.rb
index a5b4679fae..9e66cab052 100644
--- a/actionpack/lib/action_dispatch/journey/visitors.rb
+++ b/actionpack/lib/action_dispatch/journey/visitors.rb
@@ -1,9 +1,12 @@
 # encoding: utf-8
+
+require 'thread_safe'
+
 module ActionDispatch
   module Journey # :nodoc:
     module Visitors # :nodoc:
       class Visitor # :nodoc:
-        DISPATCH_CACHE = Hash.new { |h,k|
+        DISPATCH_CACHE = ThreadSafe::Cache.new { |h,k|
           h[k] = :"visit_#{k}"
         }