1 files changed, 13 insertions, 9 deletions
diff --git a/actionview/lib/action_view/cache_expiry.rb b/actionview/lib/action_view/cache_expiry.rb
index 820afc093d..27690561b7 100644
--- a/actionview/lib/action_view/cache_expiry.rb
+++ b/actionview/lib/action_view/cache_expiry.rb
@@ -16,18 +16,23 @@ module ActionView
       @watched_dirs = nil
       @watcher_class = watcher
       @watcher = nil
+      @mutex = Mutex.new
     end
 
     def clear_cache_if_necessary
-      watched_dirs = dirs_to_watch
-      if watched_dirs != @watched_dirs
-        @watched_dirs = watched_dirs
-        @watcher = @watcher_class.new([], watched_dirs) do
-          clear_cache
+      @mutex.synchronize do
+        watched_dirs = dirs_to_watch
+        return if watched_dirs.empty?
+
+        if watched_dirs != @watched_dirs
+          @watched_dirs = watched_dirs
+          @watcher = @watcher_class.new([], watched_dirs) do
+            clear_cache
+          end
+          @watcher.execute
+        else
+          @watcher.execute_if_updated
         end
-        @watcher.execute
-      else
-        @watcher.execute_if_updated
       end
     end
 
@@ -36,7 +41,6 @@ module ActionView
     end
 
     private
-
       def dirs_to_watch
         fs_paths = all_view_paths.grep(FileSystemResolver)
         fs_paths.map(&:path).sort.uniq